* provided "as is" without express or implied warranty. *
**************************************************************************/
-/*
-$Log$
-Revision 1.18 2002/11/07 09:13:42 morsch
-Use "Vogt" to label new distributions.
-
-Revision 1.17 2002/11/07 09:06:10 morsch
-J/Psi and Upsilon pt and y distributions from R. Vogt 2002 added.
-
-Revision 1.16 2002/10/14 14:55:35 hristov
-Merging the VirtualMC branch to the main development branch (HEAD)
-
-Revision 1.14.6.1 2002/06/10 14:57:41 hristov
-Merged with v3-08-02
-
-Revision 1.15 2002/04/17 10:11:51 morsch
-Coding Rule violations corrected.
-
-Revision 1.14 2002/02/22 17:26:43 morsch
-Eta and omega added.
-
-Revision 1.13 2001/03/27 11:01:04 morsch
-Charm pt-distribution corrected. More realistic y-distribution for pi and K.
-
-Revision 1.12 2001/03/09 13:01:41 morsch
-- enum constants for paramterisation type (particle family) moved to AliGen*lib.h
-- use AliGenGSIlib::kUpsilon, AliGenPHOSlib::kEtaPrime to access the constants
-
-Revision 1.11 2000/11/30 07:12:50 alibrary
-Introducing new Rndm and QA classes
-
-Revision 1.10 2000/06/29 21:08:27 morsch
-All paramatrisation libraries derive from the pure virtual base class AliGenLib.
-This allows to pass a pointer to a library directly to AliGenParam and avoids the
-use of function pointers in Config.C.
-
-Revision 1.9 2000/06/14 15:20:56 morsch
-Include clean-up (IH)
-
-Revision 1.8 2000/06/09 20:32:11 morsch
-All coding rule violations except RS3 corrected
-
-Revision 1.7 2000/05/02 08:12:13 morsch
-Coding rule violations corrected.
-
-Revision 1.6 1999/09/29 09:24:14 fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
// Library class for particle pt and y distributions used for
// muon spectrometer simulations.
ClassImp(AliGenMUONlib)
//
// Pions
-Double_t AliGenMUONlib::PtPion(Double_t *px, Double_t *dummy)
+Double_t AliGenMUONlib::PtPion(Double_t *px, Double_t* /*dummy*/)
{
//
// PT-PARAMETERIZATION CDF, PRL 61(88) 1819
//
// y-distribution
//
-Double_t AliGenMUONlib::YPion( Double_t *py, Double_t *dummy)
+Double_t AliGenMUONlib::YPion( Double_t *py, Double_t */*dummy*/)
{
// Pion y
Double_t y=TMath::Abs(*py);
//
// pt-distribution
//____________________________________________________________
-Double_t AliGenMUONlib::PtKaon( Double_t *px, Double_t *dummy)
+Double_t AliGenMUONlib::PtKaon( Double_t *px, Double_t */*dummy*/)
{
// Kaon pT
return PtScal(*px,2);
// y-distribution
//____________________________________________________________
-Double_t AliGenMUONlib::YKaon( Double_t *py, Double_t *dummy)
+Double_t AliGenMUONlib::YKaon( Double_t *py, Double_t */*dummy*/)
{
// Kaon y
Double_t y=TMath::Abs(*py);
//
// pt-distribution
//____________________________________________________________
-Double_t AliGenMUONlib::PtJpsi( Double_t *px, Double_t *dummy)
+Double_t AliGenMUONlib::PtJpsi( Double_t *px, Double_t */*dummy*/)
{
// J/Psi pT
const Double_t kpt0 = 4.;
return x/TMath::Power(pass1,kxn);
}
-Double_t AliGenMUONlib::PtJpsiPbPb( Double_t *px, Double_t *dummy)
+Double_t AliGenMUONlib::PtJpsiCDFscaled( Double_t *px, Double_t */*dummy*/)
+{
+// J/Psi pT
+ const Double_t kpt0 = 4.703;
+ const Double_t kxn = 3.826;
+ Double_t x=*px;
+ //
+ Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+ return x/TMath::Power(pass1,kxn);
+}
+
+Double_t AliGenMUONlib::PtJpsiCDFscaledPP( Double_t *px, Double_t */*dummy*/)
+{
+// J/Psi pT
+//
+// pp 14 TeV
+//
+// scaled from CDF data at 2 TeV
+
+ const Double_t kpt0 = 5.355;
+ const Double_t kxn = 3.821;
+ Double_t x=*px;
+ //
+ Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+ return x/TMath::Power(pass1,kxn);
+}
+
+Double_t AliGenMUONlib::PtJpsiFlat( Double_t */*px*/, Double_t */*dummy*/ )
+{
+ return 1.;
+}
+
+Double_t AliGenMUONlib::PtJpsiPbPb( Double_t *px, Double_t */*dummy*/)
{
// J/Psi pT spectrum
//
-1.83806e-01, 1.55853e-02, -7.23241e-04, 1.42105e-05
};
- Int_t j;
- Double_t y = c[j = 7];
- while (j > 0) y = y * x +c[--j];
- y = x * TMath::Exp(y);
+ Double_t y;
+ if (x < 10.) {
+ Int_t j;
+ y = c[j = 7];
+ while (j > 0) y = y * x +c[--j];
+ y = x * TMath::Exp(y);
+ } else {
+ y = 0.;
+ }
+ return y;
+}
+
+Double_t AliGenMUONlib::PtJpsiBPbPb( Double_t *px, Double_t */*dummy*/)
+{
+// J/Psi pT spectrum
+// B -> J/Psi X
+ Double_t x0 = 4.0384;
+ Double_t n = 3.0288;
+
+ Double_t x = px[0];
+ Double_t y = x / TMath::Power((1. + (x/x0)*(x/x0)), n);
+
+ return y;
+}
+
+
+Double_t AliGenMUONlib::PtJpsiPP( Double_t *px, Double_t */*dummy*/)
+{
+// J/Psi pT spectrum
+//
+// R. Vogt 2002
+// pp 14 TeV
+// MRST HO
+// mc = 1.4 GeV, pt-kick 1 GeV
+//
+ Float_t x = px[0];
+ Float_t c[4] = {8.47471e+00, -1.93567e+00, 1.50271e-01, -5.51212e-03};
+
+ Double_t y;
+ if (x < 10.) {
+ Int_t j;
+ y = c[j = 3];
+ while (j > 0) y = y * x +c[--j];
+ y = x * TMath::Exp(y);
+ } else {
+ y = 0.;
+ }
return y;
}
+
//
// y-distribution
//____________________________________________________________
-Double_t AliGenMUONlib::YJpsi(Double_t *py, Double_t *dummy)
+Double_t AliGenMUONlib::YJpsi(Double_t *py, Double_t */*dummy*/)
{
// J/psi y
const Double_t ky0 = 4.;
return yj;
}
+Double_t AliGenMUONlib::YJpsiFlat( Double_t */*py*/, Double_t */*dummy*/ )
+{
+ return 1.;
+}
-Double_t AliGenMUONlib::YJpsiPbPb( Double_t *px, Double_t *dummy)
+
+Double_t AliGenMUONlib::YJpsiPbPb( Double_t *px, Double_t */*dummy*/)
{
//
return y;
}
+Double_t AliGenMUONlib::YJpsiCDFscaled( Double_t *px, Double_t* dummy)
+{
+ // J/Psi y
+ return AliGenMUONlib::YJpsiPbPb(px, dummy);
+}
+
+Double_t AliGenMUONlib::YJpsiCDFscaledPP( Double_t *px, Double_t* dummy)
+{
+ // J/Psi y
+ return AliGenMUONlib::YJpsiPP(px, dummy);
+}
+
+Double_t AliGenMUONlib::YJpsiPP( Double_t *px, Double_t */*dummy*/)
+{
+
+//
+// J/Psi y
+//
+//
+// R. Vogt 2002
+// pp 14 TeV
+// MRST HO
+// mc = 1.4 GeV, pt-kick 1 GeV
+//
+
+ Double_t c[5] = {1.38532e+00, 1.00596e+02, -3.46378e+01, 3.94172e+00, -1.48319e-01};
+ Double_t x = TMath::Abs(px[0]);
+ Double_t y;
+
+ if (x < 2.5) {
+ y = 96.455 - 0.8483 * x * x;
+ } else if (x < 7.9) {
+ Int_t j;
+ y = c[j = 4];
+ while (j > 0) y = y * x + c[--j];
+ } else {
+ y =0.;
+ }
+
+ return y;
+}
+
+Double_t AliGenMUONlib::YJpsiBPbPb( Double_t *px, Double_t */*dummy*/)
+{
+
+//
+// J/Psi from B->J/Psi X
+//
+//
+
+
+ Double_t c[7] = {7.37025e-02, 0., -2.94487e-03, 0., 6.07953e-06, 0., 5.39219e-07};
+
+ Double_t x = TMath::Abs(px[0]);
+ Double_t y;
+
+ if (x > 6.) {
+ y = 0.;
+ } else {
+ Int_t j;
+ y = c[j = 6];
+ while (j > 0) y = y * x + c[--j];
+ }
+
+ return y;
+}
+
+
+
// particle composition
//
Int_t AliGenMUONlib::IpJpsi(TRandom *)
// J/Psi composition
return 443;
}
+Int_t AliGenMUONlib::IpPsiP(TRandom *)
+{
+// Psi prime composition
+ return 100443;
+}
+Int_t AliGenMUONlib::IpJpsiFamily(TRandom *)
+{
+// J/Psi composition
+ Int_t ip;
+ Float_t r = gRandom->Rndm();
+ if (r < 0.98) {
+ ip = 443;
+ } else {
+ ip = 100443;
+ }
+ return ip;
+}
+
+
// Upsilon
//
//
// pt-distribution
//____________________________________________________________
-Double_t AliGenMUONlib::PtUpsilon( Double_t *px, Double_t *dummy )
+Double_t AliGenMUONlib::PtUpsilon( Double_t *px, Double_t */*dummy*/ )
{
// Upsilon pT
const Double_t kpt0 = 5.3;
return x/TMath::Power(pass1,kxn);
}
-Double_t AliGenMUONlib::PtUpsilonPbPb( Double_t *px, Double_t *dummy)
+Double_t AliGenMUONlib::PtUpsilonCDFscaled( Double_t *px, Double_t */*dummy*/ )
+{
+// Upsilon pT
+ const Double_t kpt0 = 7.753;
+ const Double_t kxn = 3.042;
+ Double_t x=*px;
+ //
+ Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+ return x/TMath::Power(pass1,kxn);
+}
+
+Double_t AliGenMUONlib::PtUpsilonCDFscaledPP( Double_t *px, Double_t */*dummy*/ )
+{
+// Upsilon pT
+//
+// pp 14 TeV
+//
+// scaled from CDF data at 2 TeV
+
+ const Double_t kpt0 = 8.610;
+ const Double_t kxn = 3.051;
+ Double_t x=*px;
+ //
+ Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+ return x/TMath::Power(pass1,kxn);
+}
+
+Double_t AliGenMUONlib::PtUpsilonFlat( Double_t */*px*/, Double_t */*dummy*/ )
+{
+ return 1.;
+}
+
+Double_t AliGenMUONlib::PtUpsilonPbPb( Double_t *px, Double_t */*dummy*/)
{
//
-1.03488e+01, 1.28065e+01, -6.60500e+00, 1.66140e+00,
-2.34293e-01, 1.86925e-02, -7.80708e-04, 1.30610e-05
};
- Int_t j;
- Double_t y = c[j = 7];
- while (j > 0) y = y * x +c[--j];
- y = x * TMath::Exp(y);
+ Double_t y;
+ if (x < 10.) {
+ Int_t j;
+ y = c[j = 7];
+ while (j > 0) y = y * x +c[--j];
+ y = x * TMath::Exp(y);
+ } else {
+ y = 0.;
+ }
+ return y;
+}
+
+Double_t AliGenMUONlib::PtUpsilonPP( Double_t *px, Double_t */*dummy*/)
+{
+
+//
+// Upsilon pT
+//
+//
+// R. Vogt 2002
+// pp 14 TeV
+// MRST HO
+// mc = 1.4 GeV, pt-kick 1 GeV
+//
+ Float_t x = px[0];
+ Double_t c[8] = {-7.93955e+00, 1.06306e+01, -5.21392e+00, 1.19703e+00,
+ -1.45718e-01, 8.95151e-03, -2.04806e-04, -1.13053e-06};
+
+ Double_t y;
+ if (x < 10.) {
+ Int_t j;
+ y = c[j = 7];
+ while (j > 0) y = y * x +c[--j];
+ y = x * TMath::Exp(y);
+ } else {
+ y = 0.;
+ }
return y;
}
// y-distribution
//
//____________________________________________________________
-Double_t AliGenMUONlib::YUpsilon(Double_t *py, Double_t *dummy)
+Double_t AliGenMUONlib::YUpsilon(Double_t *py, Double_t */*dummy*/)
{
// Upsilon y
const Double_t ky0 = 3.;
}
-Double_t AliGenMUONlib::YUpsilonPbPb( Double_t *px, Double_t *dummy)
+Double_t AliGenMUONlib::YUpsilonPbPb( Double_t *px, Double_t */*dummy*/)
{
//
return y;
}
+Double_t AliGenMUONlib::YUpsilonCDFscaled( Double_t *px, Double_t *dummy)
+{
+ // Upsilon y
+ return AliGenMUONlib::YUpsilonPbPb(px, dummy);
+
+}
+
+Double_t AliGenMUONlib::YUpsilonCDFscaledPP( Double_t *px, Double_t *dummy)
+{
+ // Upsilon y
+ return AliGenMUONlib::YUpsilonPP(px, dummy);
+
+}
+
+Double_t AliGenMUONlib::YUpsilonFlat( Double_t */*px*/, Double_t */*dummy*/)
+{
+ // Upsilon y
+ return 1.;
+
+}
+
+Double_t AliGenMUONlib::YUpsilonPP( Double_t *px, Double_t */*dummy*/)
+{
+
+//
+// Upsilon y
+//
+//
+// R. Vogt 2002
+// p p 14. TeV
+// MRST HO
+// mc = 1.4 GeV, pt-kick 1 GeV
+//
+ Double_t c[7] = {8.91936e-01, -6.46645e-07, -1.52774e-02, 4.28677e-08, -7.01517e-04,
+ -6.20539e-10, 1.29943e-05};
+
+ Double_t x = px[0];
+ if (TMath::Abs(x) > 6.2) return 0.;
+ Int_t j;
+ Double_t y = c[j = 6];
+ while (j > 0) y = y * x +c[--j];
+ return y;
+}
+
// particle composition
//
Int_t AliGenMUONlib::IpUpsilon(TRandom *)
// y composition
return 553;
}
+Int_t AliGenMUONlib::IpUpsilonP(TRandom *)
+{
+// y composition
+ return 100553;
+}
+Int_t AliGenMUONlib::IpUpsilonPP(TRandom *)
+{
+// y composition
+ return 200553;
+}
+Int_t AliGenMUONlib::IpUpsilonFamily(TRandom *)
+{
+// y composition
+ Int_t ip;
+ Float_t r = gRandom->Rndm();
+
+ if (r < 0.712) {
+ ip = 553;
+ } else if (r < 0.896) {
+ ip = 100553;
+ } else {
+ ip = 200553;
+ }
+ return ip;
+}
+
//
// Phi
//
// pt-distribution (by scaling of pion distribution)
//____________________________________________________________
-Double_t AliGenMUONlib::PtPhi( Double_t *px, Double_t *dummy)
+Double_t AliGenMUONlib::PtPhi( Double_t *px, Double_t */*dummy*/)
{
// Phi pT
return PtScal(*px,7);
}
// y-distribution
-Double_t AliGenMUONlib::YPhi( Double_t *px, Double_t *dummy)
+Double_t AliGenMUONlib::YPhi( Double_t *px, Double_t */*dummy*/)
{
// Phi y
Double_t *dum=0;
//
// pt-distribution (by scaling of pion distribution)
//____________________________________________________________
-Double_t AliGenMUONlib::PtOmega( Double_t *px, Double_t *dummy)
+Double_t AliGenMUONlib::PtOmega( Double_t *px, Double_t */*dummy*/)
{
// Omega pT
return PtScal(*px,5);
}
// y-distribution
-Double_t AliGenMUONlib::YOmega( Double_t *px, Double_t *dummy)
+Double_t AliGenMUONlib::YOmega( Double_t *px, Double_t */*dummy*/)
{
// Omega y
Double_t *dum=0;
//
// pt-distribution (by scaling of pion distribution)
//____________________________________________________________
-Double_t AliGenMUONlib::PtEta( Double_t *px, Double_t *dummy)
+Double_t AliGenMUONlib::PtEta( Double_t *px, Double_t */*dummy*/)
{
// Eta pT
return PtScal(*px,3);
}
// y-distribution
-Double_t AliGenMUONlib::YEta( Double_t *px, Double_t *dummy)
+Double_t AliGenMUONlib::YEta( Double_t *px, Double_t */*dummy*/)
{
// Eta y
Double_t *dum=0;
//
// pt-distribution
//____________________________________________________________
-Double_t AliGenMUONlib::PtCharm( Double_t *px, Double_t *dummy)
+Double_t AliGenMUONlib::PtCharm( Double_t *px, Double_t */*dummy*/)
+{
+// Charm pT
+ const Double_t kpt0 = 2.25;
+ const Double_t kxn = 3.17;
+
+ Double_t x=*px;
+ //
+ Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+ return x/TMath::Power(pass1,kxn);
+}
+
+Double_t AliGenMUONlib::PtCharmCentral( Double_t *px, Double_t */*dummy*/)
{
// Charm pT
- const Double_t kpt0 = 4.08;
- const Double_t kxn = 9.40;
+ const Double_t kpt0 = 2.12;
+ const Double_t kxn = 2.78;
Double_t x=*px;
//
- Double_t pass1 = 1.+(x/kpt0);
+ Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
return x/TMath::Power(pass1,kxn);
}
// y-distribution
-Double_t AliGenMUONlib::YCharm( Double_t *px, Double_t *dummy)
+Double_t AliGenMUONlib::YCharm( Double_t *px, Double_t */*dummy*/)
{
-// Charm y
- Double_t *dum=0;
- return YJpsi(px,dum);
+// Charm y :: Carrer & Dainese : ALICE-INT-2003-019 v.3 (hep-ph/0311225)
+// Pythia tuned to reproduce the distribution given by the HVQMNR program based on NLO calculations (pQCD)
+// shadowing + kt broadening
+
+ Double_t x=px[0];
+ Double_t c[2]={-2.42985e-03,-2.31001e-04};
+ Double_t y=1+(c[0]*TMath::Power(x,2))+(c[1]*TMath::Power(x,4));
+ Double_t ycharm;
+
+ if (TMath::Abs(x)>8) {
+ ycharm=0.;
+ }
+ else {
+ ycharm=TMath::Power(y,3);
+ }
+
+ return ycharm;
}
+
Int_t AliGenMUONlib::IpCharm(TRandom *ran)
{
// Charm composition
Int_t ip;
// 411,421,431,4122
random = ran->Rndm();
- if (random < 0.5) {
- ip=411;
- } else if (random < 0.75) {
- ip=421;
- } else if (random < 0.90) {
- ip=431;
+// Taux de production Carrer & Dainese : ALICE-INT-2003-019 v.3
+// >>>>> cf. tab 4 p 11
+
+ if (random < 0.30) {
+ ip=421;
+ } else if (random < 0.60) {
+ ip=-421;
+ } else if (random < 0.70) {
+ ip=411;
+ } else if (random < 0.80) {
+ ip=-411;
+ } else if (random < 0.86) {
+ ip=431;
+ } else if (random < 0.92) {
+ ip=-431;
+ } else if (random < 0.96) {
+ ip=4122;
} else {
- ip=4122;
+ ip=-4122;
}
- if (ran->Rndm() < 0.5) {ip=-ip;}
return ip;
}
-
//
// Beauty
//
//
// pt-distribution
//____________________________________________________________
-Double_t AliGenMUONlib::PtBeauty( Double_t *px, Double_t *dummy)
+Double_t AliGenMUONlib::PtBeauty( Double_t *px, Double_t */*dummy*/)
{
// Beauty pT
- const Double_t kpt0 = 4.;
- const Double_t kxn = 3.6;
+ const Double_t kpt0 = 6.53;
+ const Double_t kxn = 3.59;
+ Double_t x=*px;
+ //
+ Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+ return x/TMath::Power(pass1,kxn);
+}
+
+Double_t AliGenMUONlib::PtBeautyCentral( Double_t *px, Double_t */*dummy*/)
+{
+// Beauty pT
+ const Double_t kpt0 = 6.14;
+ const Double_t kxn = 2.93;
Double_t x=*px;
//
Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
return x/TMath::Power(pass1,kxn);
}
// y-distribution
-Double_t AliGenMUONlib::YBeauty( Double_t *px, Double_t *dummy)
+Double_t AliGenMUONlib::YBeauty( Double_t *px, Double_t */*dummy*/)
{
-// Beauty y
- Double_t *dum=0;
- return YJpsi(px,dum);
+// Beauty y :: Carrer & Dainese : ALICE-INT-2003-019 v.3 (hep-ph/0311225)
+// Pythia tuned to reproduce the distribution given by the HVQMNR program based on NLO calculations (pQCD)
+// shadowing + kt broadening
+
+ Double_t x=px[0];
+ Double_t c[2]={-1.27590e-02,-2.42731e-04};
+ Double_t y=1+c[0]*TMath::Power(x,2)+c[1]*TMath::Power(x,4);
+ Double_t ybeauty;
+
+ if (TMath::Abs(x)>6) {
+ ybeauty=0.;
+ }
+ else {
+ ybeauty=TMath::Power(y,3);
+ }
+
+ return ybeauty;
}
+
Int_t AliGenMUONlib::IpBeauty(TRandom *ran)
{
// Beauty Composition
Float_t random;
Int_t ip;
- random = ran->Rndm();
- if (random < 0.5) {
- ip=511;
- } else if (random < 0.75) {
- ip=521;
- } else if (random < 0.90) {
- ip=531;
+ random = ran->Rndm();
+
+// Taux de production Carrer & Dainese : ALICE-INT-2003-019 v.3
+// >>>>> cf. tab 4 p 11
+
+ if (random < 0.20) {
+ ip=511;
+ } else if (random < 0.40) {
+ ip=-511;
+ } else if (random < 0.605) {
+ ip=521;
+ } else if (random < 0.81) {
+ ip=-521;
+ } else if (random < 0.87) {
+ ip=531;
+ } else if (random < 0.93) {
+ ip=-531;
+ } else if (random < 0.965) {
+ ip=5122;
} else {
- ip=5122;
+ ip=-5122;
}
- if (ran->Rndm() < 0.5) {ip=-ip;}
- return ip;
+ return ip;
}
+
typedef Double_t (*GenFunc) (Double_t*, Double_t*);
GenFunc AliGenMUONlib::GetPt(Int_t param, const char* tname) const
{
case kEta:
func=PtEta;
break;
+ case kJpsiFamily:
+ case kPsiP:
case kJpsi:
- if (sname == "Vogt") {
+ if (sname == "Vogt" || sname == "Vogt PbPb") {
func=PtJpsiPbPb;
+ } else if (sname == "Vogt pp") {
+ func=PtJpsiPP;
+ } else if (sname == "CDF scaled") {
+ func=PtJpsiCDFscaled;
+ } else if (sname == "CDF pp") {
+ func=PtJpsiCDFscaledPP;
+ } else if (sname == "Flat") {
+ func=PtJpsiFlat;
} else {
func=PtJpsi;
}
break;
+ case kJpsiFromB:
+ func = PtJpsiBPbPb;
+ break;
+ case kUpsilonFamily:
+ case kUpsilonP:
+ case kUpsilonPP:
case kUpsilon:
- if (sname == "Vogt") {
+ if (sname == "Vogt" || sname == "Vogt PbPb") {
func=PtUpsilonPbPb;
+ } else if (sname == "Vogt pp") {
+ func=PtUpsilonPP;
+ } else if (sname == "CDF scaled") {
+ func=PtUpsilonCDFscaled;
+ } else if (sname == "CDF pp") {
+ func=PtUpsilonCDFscaledPP;
+ } else if (sname == "Flat") {
+ func=PtUpsilonFlat;
} else {
func=PtUpsilon;
}
- break;
+ break;
case kCharm:
- func=PtCharm;
+ if (sname == "central") {
+ func=PtCharmCentral;
+ } else {
+ func=PtCharm;
+ }
break;
case kBeauty:
- func=PtBeauty;
+ if (sname == "central") {
+ func=PtBeautyCentral;
+ } else {
+ func=PtBeauty;
+ }
break;
case kPion:
func=PtPion;
GenFunc AliGenMUONlib::GetY(Int_t param, const char* tname) const
{
+ //
+ // Return pointer to y- parameterisation
+ //
TString sname = TString(tname);
-
-// Return pointer to y- parameterisation
GenFunc func;
switch (param)
{
case kOmega:
func=YOmega;
break;
+ case kJpsiFamily:
+ case kPsiP:
case kJpsi:
- if (sname == "Vogt") {
+ if (sname == "Vogt" || sname == "Vogt PbPb") {
func=YJpsiPbPb;
+ } else if (sname == "Vogt pp"){
+ func=YJpsiPP;
+ } else if (sname == "CDF scaled") {
+ func=YJpsiCDFscaled;
+ } else if (sname == "CDF pp") {
+ func=YJpsiCDFscaledPP;
+ } else if (sname == "Flat") {
+ func=YJpsiFlat;
} else {
func=YJpsi;
}
break;
+ case kJpsiFromB:
+ func = YJpsiBPbPb;
+ break;
+ case kUpsilonFamily:
+ case kUpsilonP:
+ case kUpsilonPP:
case kUpsilon:
- if (sname == "Vogt") {
+ if (sname == "Vogt" || sname == "Vogt PbPb") {
func=YUpsilonPbPb;
+ } else if (sname == "Vogt pp") {
+ func = YUpsilonPP;
+ } else if (sname == "CDF scaled") {
+ func=YUpsilonCDFscaled;
+ } else if (sname == "CDF pp") {
+ func=YUpsilonCDFscaledPP;
+ } else if (sname == "Flat") {
+ func=YUpsilonFlat;
} else {
func=YUpsilon;
}
return func;
}
typedef Int_t (*GenFuncIp) (TRandom *);
-GenFuncIp AliGenMUONlib::GetIp(Int_t param, const char* tname) const
+GenFuncIp AliGenMUONlib::GetIp(Int_t param, const char* /*tname*/) const
{
// Return pointer to particle type parameterisation
GenFuncIp func;
case kOmega:
func=IpOmega;
break;
+ case kJpsiFamily:
+ func=IpJpsiFamily;
+ break;
+ case kPsiP:
+ func=IpPsiP;
+ break;
case kJpsi:
+ case kJpsiFromB:
func=IpJpsi;
break;
case kUpsilon:
func=IpUpsilon;
break;
+ case kUpsilonFamily:
+ func=IpUpsilonFamily;
+ break;
+ case kUpsilonP:
+ func=IpUpsilonP;
+ break;
+ case kUpsilonPP:
+ func=IpUpsilonPP;
+ break;
case kCharm:
func=IpCharm;
break;
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff