diff --git a/CHANGELOG.md b/CHANGELOG.md index 0206f22ab..87a0dc53b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,8 @@ it in future. * chore: trim trailing whitespace * Fix mismatch dimension cavern ECN3 TCC8 * fix: use standard library to expand env +* Compatibility with ROOT 6.32, including an external TPythia6 package (not supported anymore by ROOT). + ### Changed diff --git a/macro/makeCascade.py b/macro/makeCascade.py index 0273cae9b..d15637ab0 100644 --- a/macro/makeCascade.py +++ b/macro/makeCascade.py @@ -287,7 +287,7 @@ 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) diff --git a/macro/run_simScript.py b/macro/run_simScript.py index 24d79090b..4ffc76143 100755 --- a/macro/run_simScript.py +++ b/macro/run_simScript.py @@ -2,6 +2,7 @@ import os import sys import ROOT +ROOT.gSystem.Load('libEGPythia6') ROOT.gSystem.Load('libEGPythia8') import shipunit as u diff --git a/muonShieldOptimization/makeMuonDIS.py b/muonShieldOptimization/makeMuonDIS.py index 7337abfee..2440b38c9 100644 --- a/muonShieldOptimization/makeMuonDIS.py +++ b/muonShieldOptimization/makeMuonDIS.py @@ -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' diff --git a/shipgen/CMakeLists.txt b/shipgen/CMakeLists.txt index cd41804ca..f3caa80d7 100644 --- a/shipgen/CMakeLists.txt +++ b/shipgen/CMakeLists.txt @@ -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