Skip to content

Commit 1e982af

Browse files
ypwanggypwangg
committed
fix bug in generator
1 parent ad6784c commit 1e982af

1 file changed

Lines changed: 27 additions & 31 deletions

File tree

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

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,44 +23,36 @@ o2::eventgen::GeneratorStarlight_class* makeStarlightGenerator(std::string confi
2323
// generator->setupDpmjet(dpmjetconf);
2424
return generator;
2525
}
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 = "")
26+
void configureEvtGen(o2::eventgen::GeneratorEvtGen<GeneratorCocktail>* generator, bool midrapidity)
3427
{
35-
auto generator = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorStarlight_class>();
36-
generator->selectConfiguration(configuration);
37-
generator->setCollisionSystem(energyCM, beam1Z, beam1A, beam2Z, beam2A);
38-
generator->setExtraParams(extraParams);
39-
// generator->setupDpmjet(dpmjetconf);
40-
generator->SetPolarization(1); //Transversal
41-
generator->SetSizePdg(2);
42-
generator->AddPdg(443,0);
43-
generator->AddPdg(100443,1);
28+
generator->SetPolarization(1); // Transverse
4429
TString pathO2 = gSystem->ExpandPathName("$O2DPG_MC_CONFIG_ROOT/MC/config/PWGUD/external/generator/DecayTablesEvtGen");
45-
if (configuration.find("Psi2sToMuPi") != std::string::npos) generator->SetDecayTable(Form("%s/PSI2S.MUMUPIPI.DEC",pathO2.Data()));
46-
else if (configuration.find("Psi2sToElPi") != std::string::npos) generator->SetDecayTable(Form("%s/PSI2S.EEPIPI.DEC",pathO2.Data()));
47-
else if (configuration.find("JpsiToElRad") != std::string::npos) generator->SetDecayTable(Form("%s/JPSI.EE.DEC",pathO2.Data()));
48-
return generator;
30+
if (midrapidity) {
31+
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+
}
4940
}
5041
} // namespace
5142

5243
FairGenerator* GeneratorCocktailStarlightMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "")
5344
{
5445
auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen<GeneratorCocktail>();
55-
auto genCohJpsi = makeStarlightToEvtGenGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
46+
configureEvtGen(genCocktailEvtGen, true);
47+
auto genCohJpsi = makeStarlightGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
5648
genCocktailEvtGen->AddGenerator(genCohJpsi, 1);
57-
auto genIncohJpsi = makeStarlightToEvtGenGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
49+
auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
5850
genCocktailEvtGen->AddGenerator(genIncohJpsi, 1);
5951
auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToElLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
6052
genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1);
61-
auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
53+
auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
6254
genCocktailEvtGen->AddGenerator(genCohPsi2S, 1);
63-
auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
55+
auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
6456
genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1);
6557

6658
return genCocktailEvtGen;
@@ -69,11 +61,12 @@ FairGenerator* GeneratorCocktailStarlightMidy_PbPb5TeV(float energyCM = 5360, in
6961
FairGenerator* GeneratorCocktailStarlightCoherentMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "")
7062
{
7163
auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen<GeneratorCocktail>();
72-
auto genCohJpsi = makeStarlightToEvtGenGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
64+
configureEvtGen(genCocktailEvtGen, true);
65+
auto genCohJpsi = makeStarlightGenerator("kCohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
7366
genCocktailEvtGen->AddGenerator(genCohJpsi, 1);
7467
auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToElLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
7568
genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1);
76-
auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
69+
auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
7770
genCocktailEvtGen->AddGenerator(genCohPsi2S, 1);
7871

7972
return genCocktailEvtGen;
@@ -82,9 +75,10 @@ FairGenerator* GeneratorCocktailStarlightCoherentMidy_PbPb5TeV(float energyCM =
8275
FairGenerator* GeneratorCocktailStarlightIncoherentMidy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "")
8376
{
8477
auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen<GeneratorCocktail>();
85-
auto genIncohJpsi = makeStarlightToEvtGenGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
78+
configureEvtGen(genCocktailEvtGen, true);
79+
auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToElRad", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
8680
genCocktailEvtGen->AddGenerator(genIncohJpsi, 1);
87-
auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
81+
auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToElPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
8882
genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1);
8983

9084
return genCocktailEvtGen;
@@ -93,11 +87,12 @@ FairGenerator* GeneratorCocktailStarlightIncoherentMidy_PbPb5TeV(float energyCM
9387
FairGenerator* GeneratorCocktailStarlightCoherentFwdy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "")
9488
{
9589
auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen<GeneratorCocktail>();
90+
configureEvtGen(genCocktailEvtGen, false);
9691
auto genCohJpsi = makeStarlightGenerator("kCohJpsiToMu", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
9792
genCocktailEvtGen->AddGenerator(genCohJpsi, 1);
9893
auto genTwoGammaToEl = makeStarlightGenerator("kTwoGammaToMuLow", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
9994
genCocktailEvtGen->AddGenerator(genTwoGammaToEl, 1);
100-
auto genCohPsi2S = makeStarlightToEvtGenGenerator("kCohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
95+
auto genCohPsi2S = makeStarlightGenerator("kCohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
10196
genCocktailEvtGen->AddGenerator(genCohPsi2S, 1);
10297

10398
return genCocktailEvtGen;
@@ -106,9 +101,10 @@ FairGenerator* GeneratorCocktailStarlightCoherentFwdy_PbPb5TeV(float energyCM =
106101
FairGenerator* GeneratorCocktailStarlightIncoherentFwdy_PbPb5TeV(float energyCM = 5360, int beam1Z = 82, int beam1A = 208, int beam2Z = 82, int beam2A = 208, std::string extrapars = "",std::string dpmjetconf = "")
107102
{
108103
auto genCocktailEvtGen = new o2::eventgen::GeneratorEvtGen<GeneratorCocktail>();
104+
configureEvtGen(genCocktailEvtGen, false);
109105
auto genIncohJpsi = makeStarlightGenerator("kIncohJpsiToMu", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
110106
genCocktailEvtGen->AddGenerator(genIncohJpsi, 1);
111-
auto genIncohPsi2S = makeStarlightToEvtGenGenerator("kIncohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
107+
auto genIncohPsi2S = makeStarlightGenerator("kIncohPsi2sToMuPi", energyCM, beam1Z, beam1A, beam2Z, beam2A, extrapars, dpmjetconf);
112108
genCocktailEvtGen->AddGenerator(genIncohPsi2S, 1);
113109

114110
return genCocktailEvtGen;

0 commit comments

Comments
 (0)