Skip to content

Commit 0359c36

Browse files
committed
fix bug
1 parent 1e982af commit 0359c36

1 file changed

Lines changed: 28 additions & 28 deletions

File tree

‎MC/config/PWGDQ/external/generator/GeneratorCocktailStarlight_PbPb5TeV.C‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,36 +23,40 @@ o2::eventgen::GeneratorStarlight_class* makeStarlightGenerator(std::string confi
2323
// generator->setupDpmjet(dpmjetconf);
2424
return generator;
2525
}
26-
void configureEvtGen(o2::eventgen::GeneratorEvtGen<GeneratorCocktail>* generator, bool midrapidity)
26+
o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorStarlight_class>* makeStarlightToEvtGenGenerator(std::string configuration,
27+
float energyCM,
28+
int beam1Z,
29+
int beam1A,
30+
int beam2Z,
31+
int beam2A,
32+
std::string extraParams = "",
33+
std::string dpmjetconf = "")
2734
{
28-
generator->SetPolarization(1); // Transverse
29-
TString pathO2 = gSystem->ExpandPathName("$O2DPG_MC_CONFIG_ROOT/MC/config/PWGUD/external/generator/DecayTablesEvtGen");
30-
if (midrapidity) {
35+
auto generator = makeStarlightGenerator(configuration, energyCM, beam1Z, beam1A, beam2Z, beam2A, extraParams, dpmjetconf);
36+
generator->SetPolarization(1); //Transversal
3137
generator->SetSizePdg(2);
32-
generator->AddPdg(443, 0);
33-
generator->AddPdg(100443, 1);
34-
generator->SetDecayTable(Form("%s/JPSI_PSI2S.EEPIPI.DEC", pathO2.Data()));
35-
} else {
36-
generator->SetSizePdg(1);
37-
generator->AddPdg(100443, 0);
38-
generator->SetDecayTable(Form("%s/PSI2S.MUMUPIPI.DEC", pathO2.Data()));
39-
}
38+
generator->AddPdg(443,0);
39+
generator->AddPdg(100443,1);
40+
TString pathO2 = gSystem->ExpandPathName("$O2DPG_MC_CONFIG_ROOT/MC/config/PWGUD/external/generator/DecayTablesEvtGen");
41+
if (configuration.find("Psi2sToMuPi") != std::string::npos) generator->SetDecayTable(Form("%s/PSI2S.MUMUPIPI.DEC",pathO2.Data()));
42+
else if (configuration.find("Psi2sToElPi") != std::string::npos) generator->SetDecayTable(Form("%s/PSI2S.EEPIPI.DEC",pathO2.Data()));
43+
else if (configuration.find("JpsiToElRad") != std::string::npos) generator->SetDecayTable(Form("%s/JPSI.EE.DEC",pathO2.Data()));
44+
return generator;
4045
}
4146
} // namespace
4247

4348
FairGenerator* GeneratorCocktailStarlightMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "")
4449
{
4550
auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen<GeneratorCocktail>();
46-
configureEvtGen(genCocktailEvtGen, true);
47-
auto genCohJpsi = makeStarlightGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
51+
auto genCohJpsi = makeStarlightToEvtGenGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
4852
genCocktailEvtGen->AddGenerator(genCohJpsi, 1);
49-
auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
53+
auto genIncohJpsi = makeStarlightToEvtGenGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
5054
genCocktailEvtGen->AddGenerator(genIncohJpsi, 1);
5155
auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToElLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
5256
genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1);
53-
auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
57+
auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
5458
genCocktailEvtGen->AddGenerator(genCohPsi2S, 1);
55-
auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
59+
auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
5660
genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1);
5761

5862
return genCocktailEvtGen;
@@ -61,12 +65,11 @@ FairGenerator* GeneratorCocktailStarlightMidy_PbPb5TeV(float energyCM = 5360, in
6165
FairGenerator* GeneratorCocktailStarlightCoherentMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "")
6266
{
6367
auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen<GeneratorCocktail>();
64-
configureEvtGen(genCocktailEvtGen, true);
65-
auto genCohJpsi = makeStarlightGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
68+
auto genCohJpsi = makeStarlightToEvtGenGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
6669
genCocktailEvtGen->AddGenerator(genCohJpsi, 1);
6770
auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToElLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
6871
genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1);
69-
auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
72+
auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
7073
genCocktailEvtGen->AddGenerator(genCohPsi2S, 1);
7174

7275
return genCocktailEvtGen;
@@ -75,10 +78,9 @@ FairGenerator* GeneratorCocktailStarlightCoherentMidy_PbPb5TeV(float energyCM =
7578
FairGenerator* GeneratorCocktailStarlightIncoherentMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "")
7679
{
7780
auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen<GeneratorCocktail>();
78-
configureEvtGen(genCocktailEvtGen, true);
79-
auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
81+
auto genIncohJpsi = makeStarlightToEvtGenGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
8082
genCocktailEvtGen->AddGenerator(genIncohJpsi, 1);
81-
auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
83+
auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
8284
genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1);
8385

8486
return genCocktailEvtGen;
@@ -87,12 +89,11 @@ FairGenerator* GeneratorCocktailStarlightIncoherentMidy_PbPb5TeV(float energyCM
8789
FairGenerator* GeneratorCocktailStarlightCoherentFwdy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "")
8890
{
8991
auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen<GeneratorCocktail>();
90-
configureEvtGen(genCocktailEvtGen, false);
9192
auto genCohJpsi = makeStarlightGenerator("kCohJpsiToMu", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
9293
genCocktailEvtGen->AddGenerator(genCohJpsi, 1);
9394
auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToMuLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
9495
genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1);
95-
auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
96+
auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
9697
genCocktailEvtGen->AddGenerator(genCohPsi2S, 1);
9798

9899
return genCocktailEvtGen;
@@ -101,11 +102,10 @@ FairGenerator* GeneratorCocktailStarlightCoherentFwdy_PbPb5TeV(float energyCM =
101102
FairGenerator* GeneratorCocktailStarlightIncoherentFwdy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "")
102103
{
103104
auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen<GeneratorCocktail>();
104-
configureEvtGen(genCocktailEvtGen, false);
105105
auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToMu", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
106106
genCocktailEvtGen->AddGenerator(genIncohJpsi, 1);
107-
auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
107+
auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
108108
genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1);
109109

110110
return genCocktailEvtGen;
111-
}
111+
}

0 commit comments

Comments
 (0)