Skip to content

Commit

Permalink
Allow building FairShip with standalone TPythia6 library (#597)
Browse files Browse the repository at this point in the history
  • Loading branch information
antonioiuliano2 authored Feb 26, 2025
1 parent 070c379 commit 189fedf
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ it in future.
* Don't special case EOS paths (fix #566)
* Setting up the Muon shield geometry by ROOT files is completely replaced with the temporary solution of dict in the `geometry/geometry_config.py`.
* Set up of the shield name is now done using the `--shieldName` flag instead of `--scName`.
* Allow using standalone TPythia for use with ROOT 6.32+

### Removed

Expand Down
3 changes: 2 additions & 1 deletion macro/makeCascade.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,8 @@ def fillp1(hist):
if stack[nstack][0]==idhist[i]:
idpn=0
# decide on p or n target in Mo
if random.random>fracp: idpn=1
if random.random() > fracp:
idpn = 1
idw=i*10+idpn*4+4
ib=h[str(idw)].FindBin(ptot,0.,0.)
prbsig=h[str(idw)].GetBinContent(ib)
Expand Down
4 changes: 4 additions & 0 deletions muonShieldOptimization/makeMuonDIS.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import ROOT,time,os,sys

ROOT.gROOT.LoadMacro("$VMCWORKDIR/gconfig/basiclibs.C")
ROOT.basiclibs()

nJob = 2
nMult = 10 # number of events / muon
muonIn = '$SHIPSOFT/data/muConcrete.root'
Expand Down
1 change: 1 addition & 0 deletions shipgen/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ ${CMAKE_SOURCE_DIR}/generators
${CMAKE_SOURCE_DIR}/shipdata
${CMAKE_SOURCE_DIR}/veto
${genfit2_INCDIR}
${TPYTHIA6_INCLUDE_DIR}
)

set(SYSTEM_INCLUDE_DIRECTORIES
Expand Down

0 comments on commit 189fedf

Please sign in to comment.