Skip to content

Commit

Permalink
add psi(2S) and upsilon
Browse files Browse the repository at this point in the history
  • Loading branch information
@DanielSamitz
DanielSamitz committed Dec 17, 2024
1 parent e650ea9 commit 969013e
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 33 deletions.
6 changes: 6 additions & 0 deletions MC/config/PWGEM/decaytables/decaytable_LMee.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,12 @@
1 12 0.881200 82 -82 0 0 0
1 0 0.059710 11 -11 0 0 0
1 0 0.059400 13 -13 0 0 0
100443 psi' 0 0 0 3.68609 0.000304 0.00000 6.52000E-10 0 1
1 0 0.007720 11 -11 0 0 0
1 0 0.007700 13 -13 0 0 0
553 Upsilon 0 0 0 9.39870 0.000054 0.00000 3.67000E-09 0 1
1 0 0.023900 11 -11 0 0 0
1 0 0.024800 13 -13 0 0 0
310 K0s 0 0 0 0.497611 0.00000 0.00000 2.68000E+01 0 1
1 0 0.306540 111 111 0 0 0
1 0 0.690449 -211 211 0 0 0
Expand Down
64 changes: 31 additions & 33 deletions MC/config/PWGEM/external/generator/GeneratorEMCocktailV2.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,33 +48,31 @@ public:
{GeneratorParamEMlibV2::kEtaprime, "Etaprime", 331, 0x00010},
{GeneratorParamEMlibV2::kPhi, "Phi", 333, 0x00020},
{GeneratorParamEMlibV2::kJpsi, "Jpsi", 443, 0x00040},
{GeneratorParamEMlibV2::kSigma0, "Sigma0", 3212, 0x00080},
{GeneratorParamEMlibV2::kK0s, "K0short", 310, 0x00100},
{GeneratorParamEMlibV2::kDeltaPlPl, "DeltaPlPl", 2224, 0x00200},
{GeneratorParamEMlibV2::kDeltaPl, "DeltaPl", 2214, 0x00400},
{GeneratorParamEMlibV2::kDeltaMi, "DeltaMi", 1114, 0x00800},
{GeneratorParamEMlibV2::kDeltaZero, "DeltaZero", 2114, 0x01000},
{GeneratorParamEMlibV2::kRhoPl, "RhoPl", 213, 0x02000},
{GeneratorParamEMlibV2::kRhoMi, "RhoMi", 213, 0x04000},
{GeneratorParamEMlibV2::kK0star, "K0star", 313, 0x08000},
{GeneratorParamEMlibV2::kK0l, "K0long", 130, 0x10000},
{GeneratorParamEMlibV2::kLambda, "Lambda", 3122, 0x20000},
{GeneratorParamEMlibV2::kKPl, "KPl", 321, 0x40000},
{GeneratorParamEMlibV2::kKMi, "KMi", 321, 0x80000},
{GeneratorParamEMlibV2::kOmegaPl, "OmegaPl", -3334, 0x100000},
{GeneratorParamEMlibV2::kOmegaMi, "OmegaMi", 3334, 0x200000},
{GeneratorParamEMlibV2::kXiPl, "XiPl", -3312, 0x400000},
{GeneratorParamEMlibV2::kXiMi, "XiMi", 3312, 0x800000},
{GeneratorParamEMlibV2::kSigmaPl, "SigamPl", 3224, 0x1000000},
{GeneratorParamEMlibV2::kSigmaMi, "SigmaMi", 3114, 0x2000000},
{GeneratorParamEMlibV2::kPsi2S, "Psi2S", 100443, 0x00080},
{GeneratorParamEMlibV2::kUpsilon, "Upsilon", 553, 0x00100},
{GeneratorParamEMlibV2::kSigma0, "Sigma0", 3212, 0x00200},
{GeneratorParamEMlibV2::kK0s, "K0short", 310, 0x00400},
{GeneratorParamEMlibV2::kDeltaPlPl, "DeltaPlPl", 2224, 0x00800},
{GeneratorParamEMlibV2::kDeltaPl, "DeltaPl", 2214, 0x01000},
{GeneratorParamEMlibV2::kDeltaMi, "DeltaMi", 1114, 0x02000},
{GeneratorParamEMlibV2::kDeltaZero, "DeltaZero", 2114, 0x04000},
{GeneratorParamEMlibV2::kRhoPl, "RhoPl", 213, 0x08000},
{GeneratorParamEMlibV2::kRhoMi, "RhoMi", 213, 0x10000},
{GeneratorParamEMlibV2::kK0star, "K0star", 313, 0x20000},
{GeneratorParamEMlibV2::kK0l, "K0long", 130, 0x40000},
{GeneratorParamEMlibV2::kLambda, "Lambda", 3122, 0x80000},
{GeneratorParamEMlibV2::kKPl, "KPl", 321, 0x100000},
{GeneratorParamEMlibV2::kKMi, "KMi", 321, 0x200000},
{GeneratorParamEMlibV2::kOmegaPl, "OmegaPl", -3334, 0x400000},
{GeneratorParamEMlibV2::kOmegaMi, "OmegaMi", 3334, 0x800000},
{GeneratorParamEMlibV2::kXiPl, "XiPl", -3312, 0x1000000},
{GeneratorParamEMlibV2::kXiMi, "XiMi", 3312, 0x2000000},
{GeneratorParamEMlibV2::kSigmaPl, "SigamPl", 3224, 0x4000000},
{GeneratorParamEMlibV2::kSigmaMi, "SigmaMi", 3114, 0x8000000},
{GeneratorParamEMlibV2::kDirectRealGamma, "DirectRealGamma", 22,
0x4000000},
0x10000000},
{GeneratorParamEMlibV2::kDirectVirtGamma, "DirectVirtGamma", 22,
0x8000000}};

static const int nHadrons =
GeneratorParamEMlibV2::kNParticles -
2; // total number of particles minus DirectRealGamma and DirectVirtGamma
0x20000000}};

void SetUseYWeighting(Bool_t useYWeighting) {
fUseYWeighting = useYWeighting;
Expand Down Expand Up @@ -122,11 +120,11 @@ public:

Bool_t SetPtParametrizations() {
TF1 *tempFct = NULL;
for (Int_t i = 0; i < nHadrons + 1; i++) {
for (Int_t i = 0; i < GeneratorParamEMlibV2::kNHadrons + 1; i++) {
tempFct = GeneratorParamEMlibV2::GetPtParametrization(i);
if (!tempFct)
return kFALSE;
if (i < nHadrons)
if (i < GeneratorParamEMlibV2::kNHadrons)
fPtParametrization[i] = new TF1(*tempFct);
else
fParametrizationProton = new TF1(*tempFct);
Expand All @@ -143,7 +141,7 @@ public:
//_________________________________________________________________________
Bool_t SetPtYDistributions() {
TH2F *tempPtY = NULL;
for (Int_t i = 0; i < nHadrons; i++) {
for (Int_t i = 0; i < GeneratorParamEMlibV2::kNHadrons; i++) {
tempPtY = GeneratorParamEMlibV2::GetPtYDistribution(i);
if (tempPtY)
fPtYDistribution[i] = new TH2F(*tempPtY);
Expand All @@ -165,9 +163,9 @@ public:
}*/

TF1 *GetPtParametrization(Int_t np) {
if (np < nHadrons)
if (np < GeneratorParamEMlibV2::kNHadrons)
return fPtParametrization[np];
else if (np == nHadrons)
else if (np == GeneratorParamEMlibV2::kNHadrons)
return fParametrizationProton;
else
return NULL;
Expand All @@ -176,7 +174,7 @@ public:
TH1D *GetMtScalingFactors() { return fMtScalingFactorHisto; }

TH2F *GetPtYDistribution(Int_t np) {
if (np < nHadrons)
if (np < GeneratorParamEMlibV2::kNHadrons)
return fPtYDistribution[np];
else
return NULL;
Expand Down Expand Up @@ -387,10 +385,10 @@ private:
Int_t fNPart; // multiplicity of each source per event
Double_t fYieldArray[GeneratorParamEMlibV2::kNParticles]; // array of dN/dy
// for each source
TF1 *fPtParametrization[nHadrons]; // pt paramtrizations
TF1 *fPtParametrization[GeneratorParamEMlibV2::kNHadrons]; // pt paramtrizations
TF1 *fParametrizationProton; //
TH1D *fMtScalingFactorHisto; // mt scaling factors
TH2F *fPtYDistribution[nHadrons]; // pt-y distribution
TH2F *fPtYDistribution[GeneratorParamEMlibV2::kNHadrons]; // pt-y distribution
Double_t fPtMin;
Double_t fPtMax;
Double_t fYMin;
Expand Down

0 comments on commit 969013e

Please sign in to comment.