diff --git a/examples/scripts/.gitignore b/examples/scripts/.gitignore index 18463fd..958ff86 100644 --- a/examples/scripts/.gitignore +++ b/examples/scripts/.gitignore @@ -21,3 +21,4 @@ fwdRes/fwdRes.C lutWrite*.cc *.hepmc HistoManager.h +lutCovm.hh diff --git a/examples/scripts/clean.sh b/examples/scripts/clean.sh index fe16310..915edbd 100755 --- a/examples/scripts/clean.sh +++ b/examples/scripts/clean.sh @@ -6,7 +6,7 @@ rm *.cfg *.log *.txt rm *.so *.d *.pcm rm *ACLiC* rm *.tcl -rm -f lutCovm.el.dat lutCovm.mu.dat lutCovm.pi.dat lutCovm.ka.dat lutCovm.pr.dat +rm -f ./lutCovm.*.dat rm *.C *.h rm *.pdf *.swp rm dpl-config.json imgui.ini @@ -18,3 +18,4 @@ rm lutWrite*.cc rm DetectorK.* rm -r fwdRes rm -r __pycache__ +rm lutCovm.hh diff --git a/examples/scripts/createO2tables.py b/examples/scripts/createO2tables.py index 6bddb33..ad7a550 100755 --- a/examples/scripts/createO2tables.py +++ b/examples/scripts/createO2tables.py @@ -437,6 +437,7 @@ def write_config(entry, prefix=""): run_cmd(f"cat {summaryfile} >> {s}") else: run_cmd(f"mv {summaryfile} {output_path}") + run_cmd(f"ln -s {output_path}/{summaryfile} ./") if qa: msg(" --- running test analysis", color=bcolors.HEADER) diff --git a/rpythia8/rpythia8-box.cc b/rpythia8/rpythia8-box.cc index 0ac9bb6..3c1d155 100644 --- a/rpythia8/rpythia8-box.cc +++ b/rpythia8/rpythia8-box.cc @@ -8,7 +8,7 @@ using namespace Pythia8; -int main(int argc, char **argv) +int main(int argc, char** argv) { int nevents, pdg, seed; @@ -114,6 +114,8 @@ int main(int argc, char **argv) std::cout << "Error: could not read config file \"" << background_config << "\"" << std::endl; return 1; } + pythia_bkg->readString("Random:setSeed = on"); + pythia_bkg->readString("Random:seed =" + std::to_string(seed)); pythia_bkg->init(); } @@ -148,6 +150,8 @@ int main(int argc, char **argv) // background if (pythia_bkg) { pythia_bkg->next(); + if (decay) + pythia_bkg->moreDecays(); pythia.event += pythia_bkg->event; } diff --git a/rpythia8/rpythia8-gun.cc b/rpythia8/rpythia8-gun.cc index 912d09e..2908fcd 100644 --- a/rpythia8/rpythia8-gun.cc +++ b/rpythia8/rpythia8-gun.cc @@ -111,6 +111,8 @@ int main(int argc, char** argv) std::cout << "Error: could not read config file \"" << background_config << "\"" << std::endl; return 1; } + pythia_bkg->readString("Random:setSeed = on"); + pythia_bkg->readString("Random:seed =" + std::to_string(seed)); pythia_bkg->init(); } @@ -131,6 +133,8 @@ int main(int argc, char** argv) // background if (pythia_bkg) { pythia_bkg->next(); + if (decay) + pythia_bkg->moreDecays(); pythia.event += pythia_bkg->event; }