Skip to content

Commit 2d4b340

Browse files
DanielSamitzalcaliva
DanielSamitz
authored and
alcaliva
committed
add psi(2S) and upsilon
(cherry picked from commit a1839e7)
1 parent bdc3c1c commit 2d4b340

File tree

2 files changed

+37
-33
lines changed

2 files changed

+37
-33
lines changed

‎MC/config/PWGEM/decaytables/decaytable_LMee.dat‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,12 @@
351351
1 12 0.881200 82 -82 0 0 0
352352
1 0 0.059710 11 -11 0 0 0
353353
1 0 0.059400 13 -13 0 0 0
354+
100443 psi' 0 0 0 3.68609 0.000304 0.00000 6.52000E-10 0 1
355+
1 0 0.007720 11 -11 0 0 0
356+
1 0 0.007700 13 -13 0 0 0
357+
553 Upsilon 0 0 0 9.39870 0.000054 0.00000 3.67000E-09 0 1
358+
1 0 0.023900 11 -11 0 0 0
359+
1 0 0.024800 13 -13 0 0 0
354360
310 K0s 0 0 0 0.497611 0.00000 0.00000 2.68000E+01 0 1
355361
1 0 0.306540 111 111 0 0 0
356362
1 0 0.690449 -211 211 0 0 0

‎MC/config/PWGEM/external/generator/GeneratorEMCocktailV2.C‎

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -48,33 +48,31 @@ public:
4848
{GeneratorParamEMlibV2::kEtaprime, "Etaprime", 331, 0x00010},
4949
{GeneratorParamEMlibV2::kPhi, "Phi", 333, 0x00020},
5050
{GeneratorParamEMlibV2::kJpsi, "Jpsi", 443, 0x00040},
51-
{GeneratorParamEMlibV2::kSigma0, "Sigma0", 3212, 0x00080},
52-
{GeneratorParamEMlibV2::kK0s, "K0short", 310, 0x00100},
53-
{GeneratorParamEMlibV2::kDeltaPlPl, "DeltaPlPl", 2224, 0x00200},
54-
{GeneratorParamEMlibV2::kDeltaPl, "DeltaPl", 2214, 0x00400},
55-
{GeneratorParamEMlibV2::kDeltaMi, "DeltaMi", 1114, 0x00800},
56-
{GeneratorParamEMlibV2::kDeltaZero, "DeltaZero", 2114, 0x01000},
57-
{GeneratorParamEMlibV2::kRhoPl, "RhoPl", 213, 0x02000},
58-
{GeneratorParamEMlibV2::kRhoMi, "RhoMi", 213, 0x04000},
59-
{GeneratorParamEMlibV2::kK0star, "K0star", 313, 0x08000},
60-
{GeneratorParamEMlibV2::kK0l, "K0long", 130, 0x10000},
61-
{GeneratorParamEMlibV2::kLambda, "Lambda", 3122, 0x20000},
62-
{GeneratorParamEMlibV2::kKPl, "KPl", 321, 0x40000},
63-
{GeneratorParamEMlibV2::kKMi, "KMi", 321, 0x80000},
64-
{GeneratorParamEMlibV2::kOmegaPl, "OmegaPl", -3334, 0x100000},
65-
{GeneratorParamEMlibV2::kOmegaMi, "OmegaMi", 3334, 0x200000},
66-
{GeneratorParamEMlibV2::kXiPl, "XiPl", -3312, 0x400000},
67-
{GeneratorParamEMlibV2::kXiMi, "XiMi", 3312, 0x800000},
68-
{GeneratorParamEMlibV2::kSigmaPl, "SigamPl", 3224, 0x1000000},
69-
{GeneratorParamEMlibV2::kSigmaMi, "SigmaMi", 3114, 0x2000000},
51+
{GeneratorParamEMlibV2::kPsi2S, "Psi2S", 100443, 0x00080},
52+
{GeneratorParamEMlibV2::kUpsilon, "Upsilon", 553, 0x00100},
53+
{GeneratorParamEMlibV2::kSigma0, "Sigma0", 3212, 0x00200},
54+
{GeneratorParamEMlibV2::kK0s, "K0short", 310, 0x00400},
55+
{GeneratorParamEMlibV2::kDeltaPlPl, "DeltaPlPl", 2224, 0x00800},
56+
{GeneratorParamEMlibV2::kDeltaPl, "DeltaPl", 2214, 0x01000},
57+
{GeneratorParamEMlibV2::kDeltaMi, "DeltaMi", 1114, 0x02000},
58+
{GeneratorParamEMlibV2::kDeltaZero, "DeltaZero", 2114, 0x04000},
59+
{GeneratorParamEMlibV2::kRhoPl, "RhoPl", 213, 0x08000},
60+
{GeneratorParamEMlibV2::kRhoMi, "RhoMi", 213, 0x10000},
61+
{GeneratorParamEMlibV2::kK0star, "K0star", 313, 0x20000},
62+
{GeneratorParamEMlibV2::kK0l, "K0long", 130, 0x40000},
63+
{GeneratorParamEMlibV2::kLambda, "Lambda", 3122, 0x80000},
64+
{GeneratorParamEMlibV2::kKPl, "KPl", 321, 0x100000},
65+
{GeneratorParamEMlibV2::kKMi, "KMi", 321, 0x200000},
66+
{GeneratorParamEMlibV2::kOmegaPl, "OmegaPl", -3334, 0x400000},
67+
{GeneratorParamEMlibV2::kOmegaMi, "OmegaMi", 3334, 0x800000},
68+
{GeneratorParamEMlibV2::kXiPl, "XiPl", -3312, 0x1000000},
69+
{GeneratorParamEMlibV2::kXiMi, "XiMi", 3312, 0x2000000},
70+
{GeneratorParamEMlibV2::kSigmaPl, "SigamPl", 3224, 0x4000000},
71+
{GeneratorParamEMlibV2::kSigmaMi, "SigmaMi", 3114, 0x8000000},
7072
{GeneratorParamEMlibV2::kDirectRealGamma, "DirectRealGamma", 22,
71-
0x4000000},
73+
0x10000000},
7274
{GeneratorParamEMlibV2::kDirectVirtGamma, "DirectVirtGamma", 22,
73-
0x8000000}};
74-
75-
static const int nHadrons =
76-
GeneratorParamEMlibV2::kNParticles -
77-
2; // total number of particles minus DirectRealGamma and DirectVirtGamma
75+
0x20000000}};
7876

7977
void SetUseYWeighting(Bool_t useYWeighting) {
8078
fUseYWeighting = useYWeighting;
@@ -122,11 +120,11 @@ public:
122120

123121
Bool_t SetPtParametrizations() {
124122
TF1 *tempFct = NULL;
125-
for (Int_t i = 0; i < nHadrons + 1; i++) {
123+
for (Int_t i = 0; i < GeneratorParamEMlibV2::kNHadrons + 1; i++) {
126124
tempFct = GeneratorParamEMlibV2::GetPtParametrization(i);
127125
if (!tempFct)
128126
return kFALSE;
129-
if (i < nHadrons)
127+
if (i < GeneratorParamEMlibV2::kNHadrons)
130128
fPtParametrization[i] = new TF1(*tempFct);
131129
else
132130
fParametrizationProton = new TF1(*tempFct);
@@ -143,7 +141,7 @@ public:
143141
//_________________________________________________________________________
144142
Bool_t SetPtYDistributions() {
145143
TH2F *tempPtY = NULL;
146-
for (Int_t i = 0; i < nHadrons; i++) {
144+
for (Int_t i = 0; i < GeneratorParamEMlibV2::kNHadrons; i++) {
147145
tempPtY = GeneratorParamEMlibV2::GetPtYDistribution(i);
148146
if (tempPtY)
149147
fPtYDistribution[i] = new TH2F(*tempPtY);
@@ -165,9 +163,9 @@ public:
165163
}*/
166164

167165
TF1 *GetPtParametrization(Int_t np) {
168-
if (np < nHadrons)
166+
if (np < GeneratorParamEMlibV2::kNHadrons)
169167
return fPtParametrization[np];
170-
else if (np == nHadrons)
168+
else if (np == GeneratorParamEMlibV2::kNHadrons)
171169
return fParametrizationProton;
172170
else
173171
return NULL;
@@ -176,7 +174,7 @@ public:
176174
TH1D *GetMtScalingFactors() { return fMtScalingFactorHisto; }
177175

178176
TH2F *GetPtYDistribution(Int_t np) {
179-
if (np < nHadrons)
177+
if (np < GeneratorParamEMlibV2::kNHadrons)
180178
return fPtYDistribution[np];
181179
else
182180
return NULL;
@@ -387,10 +385,10 @@ private:
387385
Int_t fNPart; // multiplicity of each source per event
388386
Double_t fYieldArray[GeneratorParamEMlibV2::kNParticles]; // array of dN/dy
389387
// for each source
390-
TF1 *fPtParametrization[nHadrons]; // pt paramtrizations
388+
TF1 *fPtParametrization[GeneratorParamEMlibV2::kNHadrons]; // pt paramtrizations
391389
TF1 *fParametrizationProton; //
392390
TH1D *fMtScalingFactorHisto; // mt scaling factors
393-
TH2F *fPtYDistribution[nHadrons]; // pt-y distribution
391+
TH2F *fPtYDistribution[GeneratorParamEMlibV2::kNHadrons]; // pt-y distribution
394392
Double_t fPtMin;
395393
Double_t fPtMax;
396394
Double_t fYMin;

0 commit comments

Comments
 (0)