Skip to content

Commit f71a6b9

Browse files
authored
Merge branch 'AliceO2Group:master' into master
2 parents 9e3d886 + 8585daa commit f71a6b9

21 files changed

+373
-44
lines changed

MC/config/PWGDQ/external/generator/generator_pythia8_NonPromptSignals_gaptriggered_dq.C

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ R__ADD_INCLUDE_PATH($O2DPG_ROOT/MC/config/PWGDQ/EvtGen)
99
#include <string>
1010

1111
using namespace o2::eventgen;
12-
using namespace Pythia8;
1312

1413
namespace o2
1514
{
@@ -140,7 +139,7 @@ Pythia8::Event mOutputEvent;
140139
// Control gap-triggering
141140
unsigned long long mGeneratedEvents;
142141
int mInverseTriggerRatio;
143-
Pythia pythiaMBgen; // minimum bias event
142+
Pythia8::Pythia pythiaMBgen; // minimum bias event
144143
TString mConfigMBdecays;
145144
int mPDG;
146145
std::vector<int> mHadronsPDGs;

MC/config/PWGDQ/ini/GeneratorHF_bbbarToBplus_midy_triggerGap.ini

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,3 @@ funcName = GeneratorBplusToJpsiKaon_EvtGen()
1212
config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/common/pythia8/generator/pythia8_hf.cfg
1313
hooksFileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C
1414
hooksFuncName = pythia8_userhooks_bbbar(-1.5,1.5)
15-
16-
### The setup inhibits transport of primary particles which are produce at forward rapidity.
17-
### The settings below only transports particles in the barrel, which is currently defined as |eta| < 2
18-
19-
[Stack]
20-
transportPrimary = barrel

MC/config/PWGDQ/ini/GeneratorHF_bbbar_PsiAndJpsi_midy_triggerGap.ini

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,3 @@ funcName = GeneratorBeautyToPsiAndJpsi_EvtGenMidY()
1212
config = ${O2DPG_MC_CONFIG_ROOT}/MC/config/common/pythia8/generator/pythia8_hf.cfg
1313
hooksFileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGHF/pythia8/hooks/pythia8_userhooks_qqbar.C
1414
hooksFuncName = pythia8_userhooks_bbbar(-1.5,1.5)
15-
16-
### The setup inhibits transport of primary particles which are produce at forward rapidity.
17-
### The settings below only transports particles in the barrel, which is currently defined as |eta| < 2
18-
19-
[Stack]
20-
transportPrimary = barrel
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
### The setup uses an external event generator
2+
### This part sets the path of the file and the function call to retrieve it
3+
4+
[GeneratorExternal]
5+
fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/external/generator/GeneratorEMCocktailV2.C
6+
funcName=GenerateEMCocktail(400,0,3,63,"${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/parametrizations/PbPb5TeV_central.json","5TeV_3040_wRatio",350,0.0,30.0,10000,1,1,0,0,"5TeV_3040_wRatio",0,1.1,"${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/decaytables/decaytable_LMee.dat",1)
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
### The setup uses an external event generator
2+
### This part sets the path of the file and the function call to retrieve it
3+
4+
[GeneratorExternal]
5+
fileName = ${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/external/generator/GeneratorEMCocktailV2.C
6+
funcName=GenerateEMCocktail(400,0,3,63,"${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/parametrizations/PbPb5TeV_central.json","5TeV_4050_wRatio",350,0.0,30.0,10000,1,1,0,0,"5TeV_4050_wRatio",0,1.1,"${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGEM/decaytables/decaytable_LMee.dat",1)

MC/config/PWGEM/parametrizations/PbPb5TeV_central.json

Lines changed: 41 additions & 11 deletions
Large diffs are not rendered by default.

MC/config/PWGLF/pythia8/generator_pythia8_extraStrangeness.C

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,5 +278,9 @@ private:
278278

279279
FairGenerator *generator_extraStrangeness()
280280
{
281-
return new GeneratorPythia8ExtraStrangeness();
281+
auto generator = new GeneratorPythia8ExtraStrangeness();
282+
gRandom->SetSeed(0);
283+
generator->readString("Random:setSeed = on");
284+
generator->readString("Random:seed =" + std::to_string(gRandom->Integer(900000000 - 2) + 1));
285+
return generator;
282286
}

MC/config/PWGLF/pythia8/generator_pythia8_syntheFlow.C

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,5 +99,9 @@ private:
9999

100100
FairGenerator *generator_syntheFlow()
101101
{
102-
return new GeneratorPythia8SyntheFlow();
102+
auto generator = new GeneratorPythia8SyntheFlow();
103+
gRandom->SetSeed(0);
104+
generator->readString("Random:setSeed = on");
105+
generator->readString("Random:seed =" + std::to_string(gRandom->Integer(900000000 - 2) + 1));
106+
return generator;
103107
}

MC/config/PWGLF/pythia8/generator_pythia8_syntheFlowXi.C

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,5 +335,9 @@ private:
335335

336336
FairGenerator *generator_syntheFlowXi()
337337
{
338-
return new GeneratorPythia8SyntheFlowXi();
338+
auto generator = new GeneratorPythia8SyntheFlowXi();
339+
gRandom->SetSeed(0);
340+
generator->readString("Random:setSeed = on");
341+
generator->readString("Random:seed =" + std::to_string(gRandom->Integer(900000000 - 2) + 1));
342+
return generator;
339343
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Decay tau-
2+
0.5 e- anti-nu_e nu_tau PHOTOS TAULNUNU; #[Reconstructed PDG2011]
3+
0.5 mu- anti-nu_mu nu_tau PHOTOS TAULNUNU; #[Reconstructed PDG2011]
4+
Enddecay
5+
Decay tau+
6+
0.5 e+ anti-nu_tau nu_e PHOTOS TAULNUNU; #[Reconstructed PDG2011]
7+
0.5 mu+ anti-nu_tau nu_mu PHOTOS TAULNUNU; #[Reconstructed PDG2011]
8+
Enddecay
9+
End

0 commit comments

Comments
 (0)