X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVGEN%2FAliGenMUONlib.cxx;h=5745e430c74297a9ee2f2ca76db6c2ab6c41a423;hb=3c8efc07dd8dba1b91c79a77d98a612456d00a93;hp=6207544baf69a2b0598c5f53ec3fa697e5b3ccc4;hpb=88e5db438d136a52020afa73aed7ee0fa5d70417;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EVGEN/AliGenMUONlib.cxx b/EVGEN/AliGenMUONlib.cxx
index 6207544baf6..5745e430c74 100644
--- a/EVGEN/AliGenMUONlib.cxx
+++ b/EVGEN/AliGenMUONlib.cxx
@@ -32,7 +32,7 @@
 ClassImp(AliGenMUONlib)
 //
 //  Pions
-Double_t AliGenMUONlib::PtPion(Double_t *px, Double_t* /*dummy*/)
+Double_t AliGenMUONlib::PtPion(const Double_t *px, const Double_t* /*dummy*/)
 {
 //
 //     PT-PARAMETERIZATION CDF, PRL 61(88) 1819
@@ -61,7 +61,7 @@ Double_t AliGenMUONlib::PtPion(Double_t *px, Double_t* /*dummy*/)
 //
 // y-distribution
 //
-Double_t AliGenMUONlib::YPion( Double_t *py, Double_t */*dummy*/)
+Double_t AliGenMUONlib::YPion( const Double_t *py, const Double_t */*dummy*/)
 {
 // Pion y
   Double_t y=TMath::Abs(*py);
@@ -97,7 +97,6 @@ Double_t AliGenMUONlib::PtScal(Double_t pt, Int_t np)
   const Double_t khm[10] = {.13957,.493,.5488,.769,.7826,.958,1.02,0,0,0};
   //     VALUE MESON/PI AT 5 GEV
   const Double_t kfmax[10]={1.,0.3,0.55,1.0,1.0,1.0,1.0,0,0,0};
-  np--;
   Double_t f5=TMath::Power(((sqrt(100.018215)+2.)/(sqrt(100.+khm[np]*khm[np])+2.0)),12.3);
   Double_t fmax2=f5/kfmax[np];
   // PIONS
@@ -111,15 +110,15 @@ Double_t AliGenMUONlib::PtScal(Double_t pt, Int_t np)
 //
 //                pt-distribution
 //____________________________________________________________
-Double_t AliGenMUONlib::PtKaon( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::PtKaon( const Double_t *px, const Double_t */*dummy*/)
 {
 // Kaon pT
-  return PtScal(*px,2);
+  return PtScal(*px,1);
 }
 
 // y-distribution
 //____________________________________________________________
-Double_t AliGenMUONlib::YKaon( Double_t *py, Double_t */*dummy*/)
+Double_t AliGenMUONlib::YKaon( const Double_t *py, const Double_t */*dummy*/)
 {
 // Kaon y
   Double_t y=TMath::Abs(*py);
@@ -151,7 +150,7 @@ Int_t AliGenMUONlib::IpKaon(TRandom *ran)
 //
 //                pt-distribution
 //____________________________________________________________
-Double_t AliGenMUONlib::PtJpsi( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::PtJpsi( const Double_t *px, const Double_t */*dummy*/)
 {
 // J/Psi pT
   const Double_t kpt0 = 4.;
@@ -162,7 +161,154 @@ Double_t AliGenMUONlib::PtJpsi( Double_t *px, Double_t */*dummy*/)
   return x/TMath::Power(pass1,kxn);
 }
 
-Double_t AliGenMUONlib::PtJpsiPbPb( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::PtJpsiCDFscaled( const Double_t *px, const Double_t */*dummy*/)
+{
+// J/Psi pT
+//
+// PbPb 5.5 TeV
+// scaled from CDF data at 2 TeV
+// see S.Grigoryan, PWG3 Meeting, 27th Oct 2008
+
+  const Double_t kpt0 = 5.100;
+  const Double_t kxn  = 4.102;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+
+Double_t AliGenMUONlib::PtJpsiCDFscaledPP( const Double_t *px, const Double_t */*dummy*/)
+{
+// J/Psi pT
+//
+// pp 14 TeV
+// scaled from CDF data at 2 TeV
+
+  const Double_t kpt0 = 5.630;
+  const Double_t kxn  = 4.071;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+
+Double_t AliGenMUONlib::PtJpsiCDFscaledPP10( const Double_t *px, const Double_t */*dummy*/)
+{
+// J/Psi pT
+//
+// pp 10 TeV
+// scaled from CDF data at 2 TeV
+
+  const Double_t kpt0 = 5.334;
+  const Double_t kxn  = 4.071;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+
+Double_t AliGenMUONlib::PtJpsiCDFscaledPP9( const Double_t *px, const Double_t */*dummy*/)
+{
+// J/Psi pT
+//
+// pp 8.8 TeV
+// scaled from CDF data at 2 TeV
+//
+  const Double_t kpt0 = 5.245;
+  const Double_t kxn  = 4.071;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+
+Double_t AliGenMUONlib::PtJpsiCDFscaledPP7( const Double_t *px, const Double_t */*dummy*/)
+{
+// J/Psi pT
+//
+// pp 7 TeV
+// scaled from CDF data at 2 TeV
+
+  const Double_t kpt0 = 5.072;
+  const Double_t kxn  = 4.071;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+
+Double_t AliGenMUONlib::PtJpsiCDFscaledPP4( const Double_t *px, const Double_t */*dummy*/)
+{
+// J/Psi pT
+//
+// pp 3.94 TeV
+// scaled from CDF data at 2 TeV
+//
+  const Double_t kpt0 = 4.647;
+  const Double_t kxn  = 4.071;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+
+Double_t AliGenMUONlib::PtJpsiCDFscaledPPb9( const Double_t *px, const Double_t *dummy)
+{
+// J/Psi pT
+//
+// pPb 8.8 TeV, for EKS98 with minimum bias shadowing factor 0.80
+//
+  Double_t c[5] = {6.42774e-01, 1.86168e-02, -6.77296e-04, 8.93512e-06, 1.31586e-07};
+  Double_t x=*px;
+  Double_t y;
+  Int_t j;
+  y = c[j = 4];
+  while (j > 0) y  = y * x + c[--j];
+  //  
+  Double_t d = 1.+c[4]*TMath::Power(x,4);
+  return y/d * AliGenMUONlib::PtJpsiCDFscaledPP9(px,dummy);
+}
+
+Double_t AliGenMUONlib::PtJpsiCDFscaledPbP9( const Double_t *px, const Double_t *dummy)
+{
+// J/Psi pT
+//
+// Pbp 8.8 TeV, for EKS98 with minimum bias shadowing factor 0.80
+//
+  Double_t c[5] = {8.58557e-01, 5.39791e-02, -4.75180e-03, 2.49463e-04, 5.52396e-05};
+  Double_t x=*px;
+  Double_t y;
+  Int_t j;
+  y = c[j = 4];
+  while (j > 0) y  = y * x + c[--j];
+  //  
+  Double_t d = 1.+c[4]*TMath::Power(x,4);
+  return y/d * AliGenMUONlib::PtJpsiCDFscaledPP9(px,dummy);
+}
+
+Double_t AliGenMUONlib::PtJpsiCDFscaledPbPb4( const Double_t *px, const Double_t *dummy)
+{
+// J/Psi pT
+//
+// PbPb 3.94 TeV, for EKS98 with minimum bias shadowing factor 0.66
+//
+  Double_t c[5] = {6.01022e-01, 4.70988e-02, -2.27917e-03, 3.09885e-05, 1.31955e-06};
+  Double_t x=*px;
+  Double_t y;
+  Int_t j;
+  y = c[j = 4];
+  while (j > 0) y  = y * x + c[--j];
+  //  
+  Double_t d = 1.+c[4]*TMath::Power(x,4);
+  return y/d * AliGenMUONlib::PtJpsiCDFscaledPP4(px,dummy);
+}
+
+Double_t AliGenMUONlib::PtJpsiFlat( const Double_t */*px*/, const Double_t */*dummy*/ )
+{
+  return 1.;
+}
+
+Double_t AliGenMUONlib::PtJpsiPbPb( const Double_t *px, const Double_t */*dummy*/)
 {
 // J/Psi pT spectrum
 //
@@ -189,7 +335,7 @@ Double_t AliGenMUONlib::PtJpsiPbPb( Double_t *px, Double_t */*dummy*/)
     return y;
 }
 
-Double_t AliGenMUONlib::PtJpsiBPbPb( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::PtJpsiBPbPb( const Double_t *px, const Double_t */*dummy*/)
 {
 // J/Psi pT spectrum
 // B -> J/Psi X
@@ -203,7 +349,7 @@ Double_t AliGenMUONlib::PtJpsiBPbPb( Double_t *px, Double_t */*dummy*/)
 }
 
 
-Double_t AliGenMUONlib::PtJpsiPP( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::PtJpsiPP( const Double_t *px, const Double_t */*dummy*/)
 {
 // J/Psi pT spectrum
 //
@@ -230,7 +376,7 @@ Double_t AliGenMUONlib::PtJpsiPP( Double_t *px, Double_t */*dummy*/)
 //
 //               y-distribution
 //____________________________________________________________
-Double_t AliGenMUONlib::YJpsi(Double_t *py, Double_t */*dummy*/)
+Double_t AliGenMUONlib::YJpsi(const Double_t *py, const Double_t */*dummy*/)
 {
 // J/psi y
   const Double_t ky0 = 4.;
@@ -245,8 +391,13 @@ Double_t AliGenMUONlib::YJpsi(Double_t *py, Double_t */*dummy*/)
   return yj;
 }
 
+Double_t AliGenMUONlib::YJpsiFlat( const Double_t */*py*/, const Double_t */*dummy*/ )
+{
+  return 1.;
+}
+
 
-Double_t AliGenMUONlib::YJpsiPbPb( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::YJpsiPbPb( const Double_t *px, const Double_t */*dummy*/)
 {
 
 //
@@ -275,7 +426,133 @@ Double_t AliGenMUONlib::YJpsiPbPb( Double_t *px, Double_t */*dummy*/)
     return y;
 }
 
-Double_t AliGenMUONlib::YJpsiPP( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::YJpsiCDFscaled( const Double_t *px, const Double_t* dummy)
+{
+    // J/Psi y 
+    return AliGenMUONlib::YJpsiPbPb(px, dummy);
+}
+
+Double_t AliGenMUONlib::YJpsiCDFscaledPP( const Double_t *px, const Double_t* dummy)
+{
+    // J/Psi y 
+    return AliGenMUONlib::YJpsiPP(px, dummy);
+}
+
+Double_t AliGenMUONlib::YJpsiCDFscaledPP10( const Double_t *px, const Double_t */*dummy*/)
+{
+// J/Psi y
+//
+// pp 10 TeV
+// scaled from YJpsiPP(14 TeV) using 10 TeV / 14 TeV ratio of y-spectra in LO pQCD. 
+// see S.Grigoryan, PWG3 Meeting, 27th Oct 2008
+//
+
+    Double_t c[5] = {2.46681e+01, 8.91486e+01, -3.21227e+01, 3.63075e+00, -1.32047e-01};
+
+    Double_t x = TMath::Abs(px[0]);
+    Double_t y;
+
+    if (x < 3.2) {
+        y = 98.523 - 1.3664 * x * x;
+    } else if (x < 7.5) {
+        Int_t j;
+        y = c[j = 4];
+        while (j > 0) y  = y * x + c[--j];
+    } else {
+        y =0.;
+    }
+
+    if(y<0) y=0;
+
+    return y;
+}
+
+Double_t AliGenMUONlib::YJpsiCDFscaledPP9( const Double_t *px, const Double_t */*dummy*/)
+{
+// J/Psi y
+//
+// pp 8.8 TeV
+// rescaling of YJpsiPP(14 TeV) using 8.8 TeV / 14 TeV ratio of y-spectra in LO QCD 
+//
+    Double_t c[5] = {3.33882e+02, -1.30980e+02, 2.59082e+01, -3.08935e+00, 1.56375e-01};
+    Double_t x = TMath::Abs(px[0]);
+    Double_t y;
+
+    if (x < 3.7) {
+        y = 99.236 - 1.5498 * x * x;
+    } else if (x < 7.4) {
+	Int_t j;
+	y = c[j = 4];
+	while (j > 0) y  = y * x + c[--j];
+    } else {
+	y =0.;
+    }
+
+    if(y<0) y=0;
+
+    return y;
+}
+
+Double_t AliGenMUONlib::YJpsiCDFscaledPP9dummy(Double_t px)
+{
+    return AliGenMUONlib::YJpsiCDFscaledPP9(&px, (Double_t*) 0);
+}
+
+Double_t AliGenMUONlib::YJpsiCDFscaledPP7( const Double_t *px, const Double_t */*dummy*/)
+{
+// J/Psi y
+//
+// pp 7 TeV
+// scaled from YJpsiPP(14 TeV) using 7 TeV / 14 TeV ratio of y-spectra in LO pQCD. 
+//
+
+    Double_t c[5] = {6.71181e+02, -3.69240e+02, 8.89644e+01, -1.04937e+01, 4.80959e-01};
+
+    Double_t x = TMath::Abs(px[0]);
+    Double_t y;
+
+    if (x < 4.0) {
+        y = 100.78 - 1.8353 * x * x;
+    } else if (x < 7.3) {
+        Int_t j;
+        y = c[j = 4];
+        while (j > 0) y  = y * x + c[--j];
+    } else {
+        y =0.;
+    }
+
+    if(y<0) y=0;
+
+    return y;
+}
+
+Double_t AliGenMUONlib::YJpsiCDFscaledPP4( const Double_t *px, const Double_t */*dummy*/)
+{
+// J/Psi y
+//
+// pp 3.94 TeV
+// rescaling of YJpsiPP(14 TeV) using 3.94 TeV / 14 TeV ratio of y-spectra in LO QCD 
+//
+    Double_t c[5] = {4.00785e+02, -1.41159e+01, -3.28599e+01, 5.53048e+00, -2.45151e-01};
+    Double_t x = TMath::Abs(px[0]);
+    Double_t y;
+
+    if (x < 5.5) {
+        y = 107.389 - 2.7454 * x * x;
+    } else if (x < 7.0) {
+	Int_t j;
+	y = c[j = 4];
+	while (j > 0) y  = y * x + c[--j];
+    } else {
+	y =0.;
+    }
+
+    if(y<0) y=0;
+
+    return y;
+}
+
+Double_t AliGenMUONlib::YJpsiPP( const Double_t *px, const Double_t */*dummy*/)
 {
 
 //
@@ -305,7 +582,60 @@ Double_t AliGenMUONlib::YJpsiPP( Double_t *px, Double_t */*dummy*/)
     return y;
 }
 
-Double_t AliGenMUONlib::YJpsiBPbPb( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::YJpsiCDFscaledPPb9( const Double_t *px, const Double_t */*dummy*/)
+{
+// J/Psi y
+//
+// pPb 8.8 TeV, for EKS98 with minimum bias shadowing factor 0.80
+//
+    Double_t c[7] = {7.52296e-01, 2.49917e-02, 3.36500e-03, 1.91187e-03, 2.92154e-04,
+		     -4.16509e-05,-7.62709e-06}; 
+    Double_t y;
+    Double_t x = px[0] + 0.47;              // rapidity shift
+    Int_t j;
+    y = c[j = 6];
+    while (j > 0) y = y * x + c[--j];
+    if(y<0) y=0;
+
+    return y * AliGenMUONlib::YJpsiCDFscaledPP9dummy(x);
+}
+
+Double_t AliGenMUONlib::YJpsiCDFscaledPbP9( const Double_t *px, const Double_t */*dummy*/)
+{
+// J/Psi y
+//
+// Pbp 8.8 TeV, for EKS98 with minimum bias shadowing factor 0.80
+//
+    Double_t c[7] = {7.52296e-01, 2.49917e-02, 3.36500e-03, 1.91187e-03, 2.92154e-04,
+		     -4.16509e-05,-7.62709e-06}; 
+    Double_t y;
+    Double_t x = -px[0] + 0.47;              // rapidity shift
+    Int_t j;
+    y = c[j = 6];
+    while (j > 0) y = y * x + c[--j];
+    if(y<0) y=0;
+
+    return y * AliGenMUONlib::YJpsiCDFscaledPP9dummy(x);
+}
+
+Double_t AliGenMUONlib::YJpsiCDFscaledPbPb4( const Double_t *px, const Double_t *dummy)
+{
+// J/Psi y
+//
+// PbPb 3.94 TeV, for EKS98 with minimum bias shadowing factor 0.66
+//
+    Double_t c[4] = {5.95228e-01, 9.45069e-03, 2.44710e-04, -1.32894e-05}; 
+    Double_t x = px[0]*px[0];
+    Double_t y;
+    Int_t j;
+    y = c[j = 3];
+    while (j > 0) y  = y * x + c[--j];
+    if(y<0) y=0;
+
+    return y * AliGenMUONlib::YJpsiCDFscaledPP4(px,dummy);
+}
+
+Double_t AliGenMUONlib::YJpsiBPbPb( const Double_t *px, const Double_t */*dummy*/)
 {
 
 //
@@ -364,7 +694,7 @@ Int_t AliGenMUONlib::IpJpsiFamily(TRandom *)
 //
 //                  pt-distribution
 //____________________________________________________________
-Double_t AliGenMUONlib::PtUpsilon( Double_t *px, Double_t */*dummy*/ )
+Double_t AliGenMUONlib::PtUpsilon( const Double_t *px, const Double_t */*dummy*/ )
 {
 // Upsilon pT
   const Double_t kpt0 = 5.3;
@@ -375,68 +705,211 @@ Double_t AliGenMUONlib::PtUpsilon( Double_t *px, Double_t */*dummy*/ )
   return x/TMath::Power(pass1,kxn);
 }
 
-Double_t AliGenMUONlib::PtUpsilonPbPb( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::PtUpsilonCDFscaled( const Double_t *px, const 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( const Double_t *px, const Double_t */*dummy*/ )
+{
 // Upsilon pT
 //
+// pp 14 TeV
 //
-// R. Vogt 2002
-// PbPb 5.5 TeV
-// MRST HO
-// mc = 1.4 GeV, pt-kick 1 GeV
-//
-    Float_t x = px[0];
-    Double_t c[8] = {
-	-1.03488e+01, 1.28065e+01, -6.60500e+00, 1.66140e+00,       
-	-2.34293e-01, 1.86925e-02, -7.80708e-04, 1.30610e-05
-    };
-    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;
+// 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::PtUpsilonPP( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::PtUpsilonCDFscaledPP10( const Double_t *px, const Double_t */*dummy*/)
 {
-
-//
 // Upsilon pT
 //
+// pp 10 TeV
 //
-// 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;
+// scaled from CDF data at 2 TeV
+
+  const Double_t kpt0 = 8.235;
+  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::PtUpsilonCDFscaledPP9( const Double_t *px, const Double_t */*dummy*/)
+{
+// Upsilon pT
+//
+// pp 8.8 TeV
+// scaled from CDF data at 2 TeV
+//
+  const Double_t kpt0 = 8.048;
+  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::PtUpsilonCDFscaledPP7( const Double_t *px, const Double_t */*dummy*/)
+{
+// Upsilon pT
+//
+// pp 7 TeV
+//
+// scaled from CDF data at 2 TeV
+
+  const Double_t kpt0 = 7.817;
+  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::PtUpsilonCDFscaledPP4( const Double_t *px, const Double_t */*dummy*/)
+{
+// Upsilon pT
+//
+// pp 3.94 TeV
+// scaled from CDF data at 2 TeV
+//
+  const Double_t kpt0 = 7.189;
+  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::PtUpsilonCDFscaledPPb9( const Double_t *px, const Double_t *dummy)
+{
+// Upsilon pT
+//
+// pPb 8.8 TeV, for EKS98 with minimum bias shadowing factor 0.90
+//
+  Double_t c[5] = {7.64952e-01, 1.12501e-04, 4.96038e-04, -3.03198e-05, 3.74035e-06};
+  Double_t x=*px;
+  Double_t y;
+  Int_t j;
+  y = c[j = 4];
+  while (j > 0) y  = y * x + c[--j];
+  //  
+  Double_t d = 1.+c[4]*TMath::Power(x,4);
+  return y/d * AliGenMUONlib::PtUpsilonCDFscaledPP9(px,dummy);
+}
+
+Double_t AliGenMUONlib::PtUpsilonCDFscaledPbP9( const Double_t *px, const Double_t *dummy)
+{
+// Upsilon pT
+//
+// Pbp 8.8 TeV, for EKS98 with minimum bias shadowing factor 0.90
+//
+  Double_t c[5] = {1.09881e+00, 3.08329e-03, -2.00356e-04, 8.28991e-06, 2.52576e-06};
+  Double_t x=*px;
+  Double_t y;
+  Int_t j;
+  y = c[j = 4];
+  while (j > 0) y  = y * x + c[--j];
+  //  
+  Double_t d = 1.+c[4]*TMath::Power(x,4);
+  return y/d * AliGenMUONlib::PtUpsilonCDFscaledPP9(px,dummy);
+}
+
+Double_t AliGenMUONlib::PtUpsilonCDFscaledPbPb4( const Double_t *px, const Double_t *dummy)
+{
+// Upsilon pT
+//
+// PbPb 3.94 TeV, for EKS98 with minimum bias shadowing factor 0.85
+//
+  Double_t c[5] = {8.65872e-01, 2.05465e-03, 2.56063e-04, -1.65598e-05, 2.29209e-06};
+  Double_t x=*px;
+  Double_t y;
+  Int_t j;
+  y = c[j = 4];
+  while (j > 0) y  = y * x + c[--j];
+  //  
+  Double_t d = 1.+c[4]*TMath::Power(x,4);
+  return y/d * AliGenMUONlib::PtUpsilonCDFscaledPP4(px,dummy);
+}
+
+Double_t AliGenMUONlib::PtUpsilonFlat( const Double_t */*px*/, const Double_t */*dummy*/ )
+{
+  return 1.;
+}
+
+Double_t AliGenMUONlib::PtUpsilonPbPb( const Double_t *px, const Double_t */*dummy*/)
+{
+//
+// Upsilon pT
+//
+//
+// R. Vogt 2002
+// PbPb 5.5 TeV
+// MRST HO
+// mc = 1.4 GeV, pt-kick 1 GeV
+//
+    Float_t x = px[0];
+    Double_t c[8] = {
+	-1.03488e+01, 1.28065e+01, -6.60500e+00, 1.66140e+00,       
+	-2.34293e-01, 1.86925e-02, -7.80708e-04, 1.30610e-05
+    };
+    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( const Double_t *px, const 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(const Double_t *py, const Double_t */*dummy*/)
 {
 // Upsilon y
   const Double_t ky0 = 3.;
@@ -452,7 +925,7 @@ Double_t AliGenMUONlib::YUpsilon(Double_t *py, Double_t */*dummy*/)
 }
 
 
-Double_t AliGenMUONlib::YUpsilonPbPb( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::YUpsilonPbPb( const Double_t *px, const Double_t */*dummy*/)
 {
 
 //
@@ -467,16 +940,107 @@ Double_t AliGenMUONlib::YUpsilonPbPb( Double_t *px, Double_t */*dummy*/)
 
     Double_t c[7] = {3.40036e-01, -3.98882e-07, -4.48398e-03, 8.46411e-08, -6.10854e-04,
 		     -2.99753e-09, 1.28895e-05};
-        
-    Double_t x = px[0];
-    if (TMath::Abs(x) > 5.55) return 0.;
+    Double_t x = TMath::Abs(px[0]);
+    if (x > 5.55) return 0.;
     Int_t j;
     Double_t y = c[j = 6];
     while (j > 0) y  = y * x +c[--j];
     return y;
 }
 
-Double_t AliGenMUONlib::YUpsilonPP( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::YUpsilonCDFscaled( const Double_t *px, const Double_t *dummy)
+{
+    // Upsilon y
+    return AliGenMUONlib::YUpsilonPbPb(px, dummy);
+    
+}
+
+Double_t AliGenMUONlib::YUpsilonCDFscaledPP( const Double_t *px, const Double_t *dummy)
+{
+    // Upsilon y
+    return AliGenMUONlib::YUpsilonPP(px, dummy);
+    
+}
+
+Double_t AliGenMUONlib::YUpsilonFlat( const Double_t */*px*/, const Double_t */*dummy*/)
+{
+    // Upsilon y
+    return 1.;
+    
+}
+
+Double_t AliGenMUONlib::YUpsilonCDFscaledPP10( const Double_t *px, const Double_t */*dummy*/)
+{
+// Upsilon y
+//
+// pp 10 TeV
+// scaled from YUpsilonPP(14 TeV) using 10 TeV / 14 TeV ratio of y-spectra in LO pQCD. 
+// see S.Grigoryan, PWG3 Meeting, 27th Oct 2008
+//
+    Double_t c[4] = {1., -2.17877e-02, -6.52830e-04, 1.40578e-05};
+    Double_t x = TMath::Abs(px[0]);
+    if (x > 6.1) return 0.;
+    Int_t j;
+    Double_t y = c[j = 3];
+    while (j > 0) y  = y * x*x +c[--j];
+    return y;
+}
+
+Double_t AliGenMUONlib::YUpsilonCDFscaledPP9( const Double_t *px, const Double_t */*dummy*/)
+{
+// Upsilon y
+//
+// pp 8.8 TeV
+// rescaling of YUpsilonPP(14 TeV) using 8.8 TeV / 14 TeV ratio of y-spectra in LO QCD 
+//
+    Double_t c[4] = {1., -2.37621e-02, -6.29610e-04, 1.47976e-05};
+    Double_t x = TMath::Abs(px[0]);
+    if (x > 6.1) return 0.;
+    Int_t j;
+    Double_t y = c[j = 3];
+    while (j > 0) y  = y * x*x +c[--j];
+    return y;
+}
+
+Double_t AliGenMUONlib::YUpsilonCDFscaledPP9dummy(Double_t px)
+{
+    return AliGenMUONlib::YUpsilonCDFscaledPP9(&px, (Double_t*) 0);
+}
+
+Double_t AliGenMUONlib::YUpsilonCDFscaledPP7( const Double_t *px, const Double_t */*dummy*/)
+{
+// Upsilon y
+//
+// pp 7 TeV
+// scaled from YUpsilonPP(14 TeV) using 7 TeV / 14 TeV ratio of y-spectra in LO pQCD. 
+//
+    Double_t c[4] = {1., -2.61009e-02, -6.83937e-04, 1.78451e-05};
+    Double_t x = TMath::Abs(px[0]);
+    if (x > 6.0) return 0.;
+    Int_t j;
+    Double_t y = c[j = 3];
+    while (j > 0) y  = y * x*x +c[--j];
+    return y;
+}
+
+Double_t AliGenMUONlib::YUpsilonCDFscaledPP4( const Double_t *px, const Double_t */*dummy*/)
+{
+// Upsilon y
+//
+// pp 3.94 TeV
+// rescaling of YUpsilonPP(14 TeV) using 3.94 TeV / 14 TeV ratio of y-spectra in LO QCD
+//
+    Double_t c[4] = {1., -3.91924e-02, -4.26184e-04, 2.10914e-05};
+    Double_t x = TMath::Abs(px[0]);
+    if (x > 5.7) return 0.;
+    Int_t j;
+    Double_t y = c[j = 3];
+    while (j > 0) y  = y * x*x +c[--j];
+
+    return y;
+}
+
+Double_t AliGenMUONlib::YUpsilonPP( const Double_t *px, const Double_t */*dummy*/)
 {
 
 //
@@ -490,15 +1054,68 @@ Double_t AliGenMUONlib::YUpsilonPP( Double_t *px, Double_t */*dummy*/)
 //
     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.;
+    Double_t x = TMath::Abs(px[0]);
+    if (x > 6.2) return 0.;
     Int_t j;
     Double_t y = c[j = 6];
     while (j > 0) y  = y * x +c[--j];
     return y;
 }
 
+Double_t AliGenMUONlib::YUpsilonCDFscaledPPb9( const Double_t *px, const Double_t */*dummy*/)
+{
+// Upsilon y
+//
+// pPb 8.8 TeV, for EKS98 with minimum bias shadowing factor 0.90
+//
+    Double_t c[7] = {8.71829e-01, 4.77467e-02, 8.09671e-03, 6.45294e-04, -2.15730e-04,
+		     -4.67538e-05,-2.11683e-06}; 
+    Double_t y;
+    Double_t x = px[0] + 0.47;              // rapidity shift
+    Int_t j;
+    y = c[j = 6];
+    while (j > 0) y = y * x + c[--j];
+    if(y<0) y=0;
+
+    return y * AliGenMUONlib::YUpsilonCDFscaledPP9dummy(x);
+}
+
+Double_t AliGenMUONlib::YUpsilonCDFscaledPbP9( const Double_t *px, const Double_t */*dummy*/)
+{
+// Upsilon y
+//
+// Pbp 8.8 TeV, for EKS98 with minimum bias shadowing factor 0.90
+//
+    Double_t c[7] = {8.71829e-01, 4.77467e-02, 8.09671e-03, 6.45294e-04, -2.15730e-04,
+		     -4.67538e-05,-2.11683e-06}; 
+    Double_t y;
+    Double_t x = -px[0] + 0.47;              // rapidity shift
+    Int_t j;
+    y = c[j = 6];
+    while (j > 0) y = y * x + c[--j];
+    if(y<0) y=0;
+
+    return y * AliGenMUONlib::YUpsilonCDFscaledPP9dummy(x);
+}
+
+Double_t AliGenMUONlib::YUpsilonCDFscaledPbPb4( const Double_t *px, const Double_t *dummy)
+{
+// Upsilon y
+//
+// PbPb 3.94 TeV, for EKS98 with minimum bias shadowing factor 0.85
+//
+    Double_t c[4] = {8.27837e-01, 1.70115e-02, -1.26046e-03, 1.52091e-05}; 
+    Double_t x = px[0]*px[0];
+    Double_t y;
+    Int_t j;
+    y = c[j = 3];
+    while (j > 0) y  = y * x + c[--j];
+    if(y<0) y=0;
+
+    return y * AliGenMUONlib::YUpsilonCDFscaledPP4(px,dummy);
+}
+
+
 //                 particle composition
 //
 Int_t AliGenMUONlib::IpUpsilon(TRandom *)
@@ -539,13 +1156,13 @@ Int_t AliGenMUONlib::IpUpsilonFamily(TRandom *)
 //
 //    pt-distribution (by scaling of pion distribution)
 //____________________________________________________________
-Double_t AliGenMUONlib::PtPhi( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::PtPhi( const Double_t *px, const Double_t */*dummy*/)
 {
 // Phi pT
-  return PtScal(*px,7);
+  return PtScal(*px,6);
 }
 //    y-distribution
-Double_t AliGenMUONlib::YPhi( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::YPhi( const Double_t *px, const Double_t */*dummy*/)
 {
 // Phi y
     Double_t *dum=0;
@@ -565,122 +1182,906 @@ Int_t AliGenMUONlib::IpPhi(TRandom *)
 //
 //    pt-distribution (by scaling of pion distribution)
 //____________________________________________________________
-Double_t AliGenMUONlib::PtOmega( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::PtOmega( const Double_t *px, const Double_t */*dummy*/)
 {
 // Omega pT
-  return PtScal(*px,5);
+  return PtScal(*px,4);
+}
+//    y-distribution
+Double_t AliGenMUONlib::YOmega( const Double_t *px, const Double_t */*dummy*/)
+{
+// Omega y
+    Double_t *dum=0;
+    return YJpsi(px,dum);
+}
+//                 particle composition
+//
+Int_t AliGenMUONlib::IpOmega(TRandom *)
+{
+// Omega composition
+    return 223;
+}
+
+
+//
+//                        Eta
+//
+//
+//    pt-distribution (by scaling of pion distribution)
+//____________________________________________________________
+Double_t AliGenMUONlib::PtEta( const Double_t *px, const Double_t */*dummy*/)
+{
+// Eta pT
+  return PtScal(*px,2);
+}
+//    y-distribution
+Double_t AliGenMUONlib::YEta( const Double_t *px, const Double_t */*dummy*/)
+{
+// Eta y
+    Double_t *dum=0;
+    return YJpsi(px,dum);
+}
+//                 particle composition
+//
+Int_t AliGenMUONlib::IpEta(TRandom *)
+{
+// Eta composition
+    return 221;
+}
+
+//
+//                        Charm
+//
+//
+//                    pt-distribution
+//____________________________________________________________
+Double_t AliGenMUONlib::PtCharm( const Double_t *px, const 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( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm pT
+  const Double_t kpt0 = 2.12;
+  const Double_t kxn  = 2.78;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+Double_t AliGenMUONlib::PtCharmF0M0S0PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// FiMjSkPP define theoretical uncertainties around F0M0S0PP as follows:
+// PtCharmFiMjSkPP = PtCharmF0M0S0PP * (dN(i,j,k)/dpt / dN(0,0,0)/dpt)_MNR
+//       i=0,1,2;  j=0,1,2;  k=0,1,...,6
+// dN(i,j,k)/dpt - spectra obtained by A.Dainese (hep-ph/0601164, p.88; 
+// http://www-zeus.desy.de/~corradi/benchmarks) from NLO pQCD (MNR)
+// calculations for the following inputs: 
+// Peterson fragmentation function (F) with \epsilon_c = 0.02, 0.002 & 0.11 
+// for i=0,1 & 2 respectively; quark mass (M) of 1.5, 1.3 & 1.7 GeV 
+// for j=0,1 & 2 respectively; 
+// factorisation \mu_F = a*mt and renormalisation \mu_R = b*mt scales (S) 
+// with a/b = 1/1, 1/0.5, 0.5/1, 0.5/0.5, 1/2, 2/1 & 2/2 
+// for k = 0, 1, 2, 3, 4, 5 & 6 respectively; CTEQ6.1 PDF set 
+// (PDF uncertainty not considered since is small, see hep-ph/0601164, p.89).
+// June 2008, Smbat.Grigoryan@cern.ch
+
+// Charm pT
+// Pythia6.214 (kCharmppMNRwmi, PDF = CTEQ5L, quark mass = 1.2 GeV, PtHard > 2.76 GeV/c)
+// for pp collisions at 14 TeV with one c-cbar pair per event.
+// Corresponding NLO total cross section is 5.68 mb
+
+
+  const Double_t kpt0 = 2.2930;
+  const Double_t kxn  = 3.1196;
+  Double_t c[3]={-5.2180e-01,1.8753e-01,2.8669e-02};
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn)*(1.+c[0]*x+c[1]*x*x)/(1.+c[2]*x*x);
+}
+Double_t AliGenMUONlib::PtCharmF1M0S0PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm pT
+// Corresponding NLO total cross section is 6.06 mb
+  const Double_t kpt0 = 2.8669;
+  const Double_t kxn  = 3.1044;
+  Double_t c[3]={-4.6714e-01,1.5005e-01,4.5003e-02};
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn)*(1.+c[0]*x+c[1]*x*x)/(1.+c[2]*x*x);
+}
+Double_t AliGenMUONlib::PtCharmF2M0S0PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm pT
+// Corresponding NLO total cross section is 6.06 mb
+  const Double_t kpt0 = 1.8361;
+  const Double_t kxn  = 3.2966;
+  Double_t c[3]={-6.1550e-01,2.6498e-01,1.0728e-02};
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn)*(1.+c[0]*x+c[1]*x*x)/(1.+c[2]*x*x);
+}
+Double_t AliGenMUONlib::PtCharmF0M1S0PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm pT
+// Corresponding NLO total cross section is 7.69 mb
+  const Double_t kpt0 = 2.1280;
+  const Double_t kxn  = 3.1397;
+  Double_t c[3]={-5.4021e-01,2.0944e-01,2.5211e-02};
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn)*(1.+c[0]*x+c[1]*x*x)/(1.+c[2]*x*x);
+}
+Double_t AliGenMUONlib::PtCharmF0M2S0PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm pT
+// Corresponding NLO total cross section is 4.81 mb
+  const Double_t kpt0 = 2.4579;
+  const Double_t kxn  = 3.1095;
+  Double_t c[3]={-5.1497e-01,1.7532e-01,3.2429e-02};
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn)*(1.+c[0]*x+c[1]*x*x)/(1.+c[2]*x*x);
+}
+Double_t AliGenMUONlib::PtCharmF0M0S1PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm pT
+// Corresponding NLO total cross section is 14.09 mb
+  const Double_t kpt0 = 2.1272;
+  const Double_t kxn  = 3.1904;
+  Double_t c[3]={-4.6088e-01,2.1918e-01,2.3055e-02};
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn)*(1.+c[0]*x+c[1]*x*x)/(1.+c[2]*x*x);
+}
+Double_t AliGenMUONlib::PtCharmF0M0S2PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm pT
+// Corresponding NLO total cross section is 1.52 mb
+  const Double_t kpt0 = 2.8159;
+  const Double_t kxn  = 3.0857;
+  Double_t c[3]={-6.4691e-01,2.0289e-01,2.4922e-02};
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn)*(1.+c[0]*x+c[1]*x*x)/(1.+c[2]*x*x);
+}
+Double_t AliGenMUONlib::PtCharmF0M0S3PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm pT
+// Corresponding NLO total cross section is 3.67 mb
+  const Double_t kpt0 = 2.7297;
+  const Double_t kxn  = 3.3019;
+  Double_t c[3]={-6.2216e-01,1.9031e-01,1.5341e-02};
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn)*(1.+c[0]*x+c[1]*x*x)/(1.+c[2]*x*x);
+}
+Double_t AliGenMUONlib::PtCharmF0M0S4PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm pT
+// Corresponding NLO total cross section is 3.38 mb
+  const Double_t kpt0 = 2.3894;
+  const Double_t kxn  = 3.1075;
+  Double_t c[3]={-4.9742e-01,1.7032e-01,2.5994e-02};
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn)*(1.+c[0]*x+c[1]*x*x)/(1.+c[2]*x*x);
+}
+Double_t AliGenMUONlib::PtCharmF0M0S5PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm pT
+// Corresponding NLO total cross section is 10.37 mb
+  const Double_t kpt0 = 2.0187;
+  const Double_t kxn  = 3.3011;
+  Double_t c[3]={-3.9869e-01,2.9248e-01,1.1763e-02};
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn)*(1.+c[0]*x+c[1]*x*x)/(1.+c[2]*x*x);
+}
+Double_t AliGenMUONlib::PtCharmF0M0S6PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm pT
+// Corresponding NLO total cross section is 7.22 mb
+  const Double_t kpt0 = 2.1089;
+  const Double_t kxn  = 3.1848;
+  Double_t c[3]={-4.6275e-01,1.8114e-01,2.1363e-02};
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn)*(1.+c[0]*x+c[1]*x*x)/(1.+c[2]*x*x);
+}
+
+//                  y-distribution
+Double_t AliGenMUONlib::YCharm( const Double_t *px, const Double_t */*dummy*/)
+{
+// 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;
+}
+Double_t AliGenMUONlib::YCharmF0M0S0PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// FiMjSkPP define theoretical uncertainties around F0M0S0PP as follows:
+// YCharmFiMjSkPP = YCharmF0M0S0PP * (dN(i,j,k)/dy / dN(0,0,0)/dy)_MNR
+//       i=0,1,2;  j=0,1,2;  k=0,1,...,6
+// dN(i,j,k)/dy - spectra obtained by A.Dainese (hep-ph/0601164, p.88; 
+// http://www-zeus.desy.de/~corradi/benchmarks) from NLO pQCD (MNR) 
+// calculations for the following inputs: 
+// Peterson fragmentation function (F) with \epsilon_c = 0.02, 0.002 & 0.11 
+// for i=0,1 & 2 respectively; quark mass (M) of 1.5, 1.3 & 1.7 GeV 
+// for j=0,1 & 2 respectively; 
+// factorisation \mu_F = a*mt and renormalisation \mu_R = b*mt scales (S) 
+// with a/b = 1/1,1/0.5, 0.5/1, 0.5/0.5, 1/2, 2/1 & 2/2 for 
+// k = 0, 1, 2, 3, 4, 5 & 6 respectively; CTEQ6.1 PDF set
+// (PDF uncertainty not considered since is small, see hep-ph/0601164, p.89).
+// June 2008, Smbat.Grigoryan@cern.ch
+
+// Charm y
+// Pythia6.214 (kCharmppMNRwmi, PDF = CTEQ5L, quark mass = 1.2 GeV, PtHard > 2.76 GeV/c)
+// for pp collisions at 14 TeV with one c-cbar pair per event.
+// Corresponding NLO total cross section is 5.68 mb
+
+    Double_t x=px[0];
+    Double_t c[2]={7.0909e-03,6.1967e-05};
+    Double_t y=1-(c[0]*TMath::Power(x,2))-(c[1]*TMath::Power(x,4));
+    Double_t ycharm;
+    
+    if (TMath::Abs(x)>9) {
+      ycharm=0.;
+    }
+    else {
+      ycharm=TMath::Power(y,3);
+    }
+    
+    return ycharm;
+}
+Double_t AliGenMUONlib::YCharmF1M0S0PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm y
+// Corresponding NLO total cross section is 6.06 mb
+    Double_t x=px[0];
+    Double_t c[2]={6.9707e-03,6.0971e-05};
+    Double_t y=1-(c[0]*TMath::Power(x,2))-(c[1]*TMath::Power(x,4));
+    Double_t ycharm;
+    
+    if (TMath::Abs(x)>9) {
+      ycharm=0.;
+    }
+    else {
+      ycharm=TMath::Power(y,3);
+    }
+    
+    return ycharm;
+}
+Double_t AliGenMUONlib::YCharmF2M0S0PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm y
+// Corresponding NLO total cross section is 6.06 mb
+    Double_t x=px[0];
+    Double_t c[2]={7.1687e-03,6.5303e-05};
+    Double_t y=1-(c[0]*TMath::Power(x,2))-(c[1]*TMath::Power(x,4));
+    Double_t ycharm;
+    
+    if (TMath::Abs(x)>9) {
+      ycharm=0.;
+    }
+    else {
+      ycharm=TMath::Power(y,3);
+    }
+    
+    return ycharm;
+}
+Double_t AliGenMUONlib::YCharmF0M1S0PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm y
+// Corresponding NLO total cross section is 7.69 mb
+    Double_t x=px[0];
+    Double_t c[2]={5.9090e-03,7.1854e-05};
+    Double_t y=1-(c[0]*TMath::Power(x,2))-(c[1]*TMath::Power(x,4));
+    Double_t ycharm;
+    
+    if (TMath::Abs(x)>9) {
+      ycharm=0.;
+    }
+    else {
+      ycharm=TMath::Power(y,3);
+    }
+    
+    return ycharm;
+}
+Double_t AliGenMUONlib::YCharmF0M2S0PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm y
+// Corresponding NLO total cross section is 4.81 mb
+    Double_t x=px[0];
+    Double_t c[2]={8.0882e-03,5.5872e-05};
+    Double_t y=1-(c[0]*TMath::Power(x,2))-(c[1]*TMath::Power(x,4));
+    Double_t ycharm;
+    
+    if (TMath::Abs(x)>9) {
+      ycharm=0.;
+    }
+    else {
+      ycharm=TMath::Power(y,3);
+    }
+    
+    return ycharm;
+}
+Double_t AliGenMUONlib::YCharmF0M0S1PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm y
+// Corresponding NLO total cross section is 14.09 mb
+    Double_t x=px[0];
+    Double_t c[2]={7.2520e-03,6.2691e-05};
+    Double_t y=1-(c[0]*TMath::Power(x,2))-(c[1]*TMath::Power(x,4));
+    Double_t ycharm;
+    
+    if (TMath::Abs(x)>9) {
+      ycharm=0.;
+    }
+    else {
+      ycharm=TMath::Power(y,3);
+    }
+    
+    return ycharm;
+}
+Double_t AliGenMUONlib::YCharmF0M0S2PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm y
+// Corresponding NLO total cross section is 1.52 mb
+    Double_t x=px[0];
+    Double_t c[2]={1.1040e-04,1.4498e-04};
+    Double_t y=1-(c[0]*TMath::Power(x,2))-(c[1]*TMath::Power(x,4));
+    Double_t ycharm;
+    
+    if (TMath::Abs(x)>9) {
+      ycharm=0.;
+    }
+    else {
+      ycharm=TMath::Power(y,3);
+    }
+    
+    return ycharm;
+}
+Double_t AliGenMUONlib::YCharmF0M0S3PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm y
+// Corresponding NLO total cross section is 3.67 mb
+    Double_t x=px[0];
+    Double_t c[2]={-3.1328e-03,1.8270e-04};
+    Double_t y=1-(c[0]*TMath::Power(x,2))-(c[1]*TMath::Power(x,4));
+    Double_t ycharm;
+    
+    if (TMath::Abs(x)>9) {
+      ycharm=0.;
+    }
+    else {
+      ycharm=TMath::Power(y,3);
+    }
+    
+    return ycharm;
+}
+Double_t AliGenMUONlib::YCharmF0M0S4PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm y
+// Corresponding NLO total cross section is 3.38 mb
+    Double_t x=px[0];
+    Double_t c[2]={7.0865e-03,6.2532e-05};
+    Double_t y=1-(c[0]*TMath::Power(x,2))-(c[1]*TMath::Power(x,4));
+    Double_t ycharm;
+    
+    if (TMath::Abs(x)>9) {
+      ycharm=0.;
+    }
+    else {
+      ycharm=TMath::Power(y,3);
+    }
+    
+    return ycharm;
+}
+Double_t AliGenMUONlib::YCharmF0M0S5PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm y
+// Corresponding NLO total cross section is 10.37 mb
+    Double_t x=px[0];
+    Double_t c[2]={7.7070e-03,5.3533e-05};
+    Double_t y=1-(c[0]*TMath::Power(x,2))-(c[1]*TMath::Power(x,4));
+    Double_t ycharm;
+    
+    if (TMath::Abs(x)>9) {
+      ycharm=0.;
+    }
+    else {
+      ycharm=TMath::Power(y,3);
+    }
+    
+    return ycharm;
+}
+Double_t AliGenMUONlib::YCharmF0M0S6PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Charm y
+// Corresponding NLO total cross section is 7.22 mb
+    Double_t x=px[0];
+    Double_t c[2]={7.9195e-03,5.3823e-05};
+    Double_t y=1-(c[0]*TMath::Power(x,2))-(c[1]*TMath::Power(x,4));
+    Double_t ycharm;
+    
+    if (TMath::Abs(x)>9) {
+      ycharm=0.;
+    }
+    else {
+      ycharm=TMath::Power(y,3);
+    }
+    
+    return ycharm;
+}
+
+
+Int_t AliGenMUONlib::IpCharm(TRandom *ran)
+{  
+// Charm composition
+    Float_t random;
+    Int_t ip;
+//    411,421,431,4122
+    random = ran->Rndm();
+//  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;
+    }
+    
+    return ip;
+}
+
+//
+//                        Beauty
+//
+//
+//                    pt-distribution
+//____________________________________________________________
+Double_t AliGenMUONlib::PtBeauty( const Double_t *px, const Double_t */*dummy*/)
+{
+// Beauty pT
+  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( const Double_t *px, const 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);
+}
+Double_t AliGenMUONlib::PtBeautyF0M0S0PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// FiMjSkPP define theoretical uncertainties around F0M0S0PP as follows:
+// PtBeautyFiMjSkPP = PtBeautyF0M0S0PP * (dN(i,j,k)/dpt / dN(0,0,0)/dpt)_MNR
+//       i=0,1,2;  j=0,1,2;  k=0,1,...,6
+// dN(i,j,k)/dpt - spectra obtained by A.Dainese (hep-ph/0601164, p.88; 
+// http://www-zeus.desy.de/~corradi/benchmarks) from NLO pQCD (MNR) 
+// calculations for the following inputs: 
+// Peterson fragmentation function (F) with \epsilon_b = 0.001, 0.0002 & 0.004 
+// for i=0,1 & 2 respectively; quark mass (M) of 4.75, 4.5 & 5.0 GeV 
+// for j=0,1 & 2 respectively; 
+// factorisation \mu_F = a*mt and renormalisation \mu_R = b*mt scales (S) 
+// with a/b = 1/1, 1/0.5, 0.5/1, 0.5/0.5, 1/2, 2/1 & 2/2 for 
+// k = 0, 1, 2, 3, 4, 5 & 6 respectively; CTEQ6.1 PDF set
+// (PDF uncertainty not considered since is small, see hep-ph/0601164, p.89).
+// June 2008, Smbat.Grigoryan@cern.ch
+
+// Beauty pT
+// Pythia6.214 (kBeautyppMNRwmi, PDF = CTEQ5L, quark mass = 4.75 GeV, PtHard > 2.76 GeV/c)
+// for pp collisions at 14 TeV with one b-bbar pair per event.
+// Corresponding NLO total cross section is 0.494 mb
+
+  const Double_t kpt0 = 8.0575;
+  const Double_t kxn  = 3.1921;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+Double_t AliGenMUONlib::PtBeautyF1M0S0PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Beauty pT
+// Corresponding NLO total cross section is 0.445 mb
+  const Double_t kpt0 = 8.6239;
+  const Double_t kxn  = 3.2911;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+Double_t AliGenMUONlib::PtBeautyF2M0S0PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Beauty pT
+// Corresponding NLO total cross section is 0.445 mb
+  const Double_t kpt0 = 7.3367;
+  const Double_t kxn  = 3.0692;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+Double_t AliGenMUONlib::PtBeautyF0M1S0PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Beauty pT
+// Corresponding NLO total cross section is 0.518 mb
+  const Double_t kpt0 = 7.6409;
+  const Double_t kxn  = 3.1364;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+Double_t AliGenMUONlib::PtBeautyF0M2S0PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Beauty pT
+// Corresponding NLO total cross section is 0.384 mb
+  const Double_t kpt0 = 8.4948;
+  const Double_t kxn  = 3.2546;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+Double_t AliGenMUONlib::PtBeautyF0M0S1PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Beauty pT
+// Corresponding NLO total cross section is 0.648 mb
+  const Double_t kpt0 = 7.6631;
+  const Double_t kxn  = 3.1621;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+Double_t AliGenMUONlib::PtBeautyF0M0S2PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Beauty pT
+// Corresponding NLO total cross section is 0.294 mb
+  const Double_t kpt0 = 8.7245;
+  const Double_t kxn  = 3.2213;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+Double_t AliGenMUONlib::PtBeautyF0M0S3PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Beauty pT
+// Corresponding NLO total cross section is 0.475 mb
+  const Double_t kpt0 = 8.5296;
+  const Double_t kxn  = 3.2187;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+Double_t AliGenMUONlib::PtBeautyF0M0S4PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Beauty pT
+// Corresponding NLO total cross section is 0.324 mb
+  const Double_t kpt0 = 7.9440;
+  const Double_t kxn  = 3.1614;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+Double_t AliGenMUONlib::PtBeautyF0M0S5PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Beauty pT
+// Corresponding NLO total cross section is 0.536 mb
+  const Double_t kpt0 = 8.2408;
+  const Double_t kxn  = 3.3029;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+Double_t AliGenMUONlib::PtBeautyF0M0S6PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Beauty pT
+// Corresponding NLO total cross section is 0.420 mb
+  const Double_t kpt0 = 7.8041;
+  const Double_t kxn  = 3.2094;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+
+//                     y-distribution
+Double_t AliGenMUONlib::YBeauty( const Double_t *px, const Double_t */*dummy*/)
+{
+// 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;
+}
+Double_t AliGenMUONlib::YBeautyF0M0S0PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// FiMjSkPP define theoretical uncertainties around F0M0S0PP as follows:
+// YBeautyFiMjSkPP = YBeautyF0M0S0PP * (dN(i,j,k)/dy / dN(0,0,0)/dy)_MNR
+//       i=0,1,2;  j=0,1,2;  k=0,1,...,6
+// dN(i,j,k)/dy - spectra obtained by A.Dainese (hep-ph/0601164, p.88; 
+// http://www-zeus.desy.de/~corradi/benchmarks) from NLO pQCD (MNR) 
+// calculations for the following inputs: 
+// Peterson fragmentation function (F) with \epsilon_b = 0.001, 0.0002 & 0.004 
+// for i=0,1 & 2 respectively; quark mass (M) of 4.75, 4.5 & 5.0 GeV 
+// for j=0,1 & 2 respectively; 
+// factorisation \mu_F = a*mt and renormalisation \mu_R = b*mt scales (S) 
+// with a/b = 1/1, 1/0.5, 0.5/1, 0.5/0.5, 1/2, 2/1 & 2/2 
+// for k = 0, 1, 2, 3, 4, 5 & 6 respectively; CTEQ6.1 PDF set 
+// (PDF uncertainty not considered since is small, see hep-ph/0601164, p.89).
+// June 2008, Smbat.Grigoryan@cern.ch
+
+// Beauty y
+// Pythia6.214 (kBeautyppMNRwmi, PDF = CTEQ5L, quark mass = 4.75 GeV, PtHard > 2.76 GeV/c)
+// for pp collisions at 14 TeV with one b-bbar pair per event.
+// Corresponding NLO total cross section is 0.494 mb
+
+
+    Double_t x=px[0];
+    Double_t c[2]={1.2350e-02,9.2667e-05};
+    Double_t y=1-c[0]*TMath::Power(x,2)-c[1]*TMath::Power(x,4);
+    Double_t ybeauty;
+    
+    if (TMath::Abs(x)>7.6) {
+      ybeauty=0.;
+    }
+    else {
+      ybeauty=TMath::Power(y,3);
+    }
+    
+    return ybeauty;
 }
-//    y-distribution
-Double_t AliGenMUONlib::YOmega( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::YBeautyF1M0S0PP( const Double_t *px, const Double_t */*dummy*/)
 {
-// Omega y
-    Double_t *dum=0;
-    return YJpsi(px,dum);
+// Beauty y
+// Corresponding NLO total cross section is 0.445 mb
+    Double_t x=px[0];
+    Double_t c[2]={1.2292e-02,9.1847e-05};
+    Double_t y=1-c[0]*TMath::Power(x,2)-c[1]*TMath::Power(x,4);
+    Double_t ybeauty;
+    
+    if (TMath::Abs(x)>7.6) {
+      ybeauty=0.;
+    }
+    else {
+      ybeauty=TMath::Power(y,3);
+    }
+    
+    return ybeauty;
 }
-//                 particle composition
-//
-Int_t AliGenMUONlib::IpOmega(TRandom *)
+Double_t AliGenMUONlib::YBeautyF2M0S0PP( const Double_t *px, const Double_t */*dummy*/)
 {
-// Omega composition
-    return 223;
+// Beauty y
+// Corresponding NLO total cross section is 0.445 mb
+    Double_t x=px[0];
+    Double_t c[2]={1.2436e-02,9.3709e-05};
+    Double_t y=1-c[0]*TMath::Power(x,2)-c[1]*TMath::Power(x,4);
+    Double_t ybeauty;
+    
+    if (TMath::Abs(x)>7.6) {
+      ybeauty=0.;
+    }
+    else {
+      ybeauty=TMath::Power(y,3);
+    }
+    
+    return ybeauty;
 }
-
-
-//
-//                        Eta
-//
-//
-//    pt-distribution (by scaling of pion distribution)
-//____________________________________________________________
-Double_t AliGenMUONlib::PtEta( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::YBeautyF0M1S0PP( const Double_t *px, const Double_t */*dummy*/)
 {
-// Eta pT
-  return PtScal(*px,3);
+// Beauty y
+// Corresponding NLO total cross section is 0.518 mb
+    Double_t x=px[0];
+    Double_t c[2]={1.1714e-02,1.0068e-04};
+    Double_t y=1-c[0]*TMath::Power(x,2)-c[1]*TMath::Power(x,4);
+    Double_t ybeauty;
+    
+    if (TMath::Abs(x)>7.6) {
+      ybeauty=0.;
+    }
+    else {
+      ybeauty=TMath::Power(y,3);
+    }
+    
+    return ybeauty;
 }
-//    y-distribution
-Double_t AliGenMUONlib::YEta( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::YBeautyF0M2S0PP( const Double_t *px, const Double_t */*dummy*/)
 {
-// Eta y
-    Double_t *dum=0;
-    return YJpsi(px,dum);
+// Beauty y
+// Corresponding NLO total cross section is 0.384 mb
+    Double_t x=px[0];
+    Double_t c[2]={1.2944e-02,8.5500e-05};
+    Double_t y=1-c[0]*TMath::Power(x,2)-c[1]*TMath::Power(x,4);
+    Double_t ybeauty;
+    
+    if (TMath::Abs(x)>7.6) {
+      ybeauty=0.;
+    }
+    else {
+      ybeauty=TMath::Power(y,3);
+    }
+    
+    return ybeauty;
 }
-//                 particle composition
-//
-Int_t AliGenMUONlib::IpEta(TRandom *)
+Double_t AliGenMUONlib::YBeautyF0M0S1PP( const Double_t *px, const Double_t */*dummy*/)
 {
-// Eta composition
-    return 221;
+// Beauty y
+// Corresponding NLO total cross section is 0.648 mb
+    Double_t x=px[0];
+    Double_t c[2]={1.2455e-02,9.2713e-05};
+    Double_t y=1-c[0]*TMath::Power(x,2)-c[1]*TMath::Power(x,4);
+    Double_t ybeauty;
+    
+    if (TMath::Abs(x)>7.6) {
+      ybeauty=0.;
+    }
+    else {
+      ybeauty=TMath::Power(y,3);
+    }
+    
+    return ybeauty;
 }
-
-//
-//                        Charm
-//
-//
-//                    pt-distribution
-//____________________________________________________________
-Double_t AliGenMUONlib::PtCharm( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::YBeautyF0M0S2PP( const Double_t *px, const Double_t */*dummy*/)
 {
-// Charm pT
-  const Double_t kpt0 = 4.08;
-  const Double_t kxn  = 9.40;
-
-  Double_t x=*px;
-  //
-  Double_t pass1 = 1.+(x/kpt0);
-  return x/TMath::Power(pass1,kxn);
+// Beauty y
+// Corresponding NLO total cross section is 0.294 mb
+    Double_t x=px[0];
+    Double_t c[2]={1.0897e-02,1.1878e-04};
+    Double_t y=1-c[0]*TMath::Power(x,2)-c[1]*TMath::Power(x,4);
+    Double_t ybeauty;
+    
+    if (TMath::Abs(x)>7.6) {
+      ybeauty=0.;
+    }
+    else {
+      ybeauty=TMath::Power(y,3);
+    }
+    
+    return ybeauty;
 }
-//                  y-distribution
-Double_t AliGenMUONlib::YCharm( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::YBeautyF0M0S3PP( const Double_t *px, const Double_t */*dummy*/)
 {
-// Charm y
-    Double_t *dum=0;
-    return YJpsi(px,dum);
+// Beauty y
+// Corresponding NLO total cross section is 0.475 mb
+    Double_t x=px[0];
+    Double_t c[2]={1.0912e-02,1.1858e-04};
+    Double_t y=1-c[0]*TMath::Power(x,2)-c[1]*TMath::Power(x,4);
+    Double_t ybeauty;
+    
+    if (TMath::Abs(x)>7.6) {
+      ybeauty=0.;
+    }
+    else {
+      ybeauty=TMath::Power(y,3);
+    }
+    
+    return ybeauty;
 }
-
-Int_t AliGenMUONlib::IpCharm(TRandom *ran)
-{  
-// Charm composition
-    Float_t random;
-    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;
-    } else {
-	ip=4122;
+Double_t AliGenMUONlib::YBeautyF0M0S4PP( const Double_t *px, const Double_t */*dummy*/)
+{
+// Beauty y
+// Corresponding NLO total cross section is 0.324 mb
+    Double_t x=px[0];
+    Double_t c[2]={1.2378e-02,9.2490e-05};
+    Double_t y=1-c[0]*TMath::Power(x,2)-c[1]*TMath::Power(x,4);
+    Double_t ybeauty;
+    
+    if (TMath::Abs(x)>7.6) {
+      ybeauty=0.;
+    }
+    else {
+      ybeauty=TMath::Power(y,3);
     }
-    if (ran->Rndm() < 0.5) {ip=-ip;}
     
-    return ip;
+    return ybeauty;
 }
-
-
-//
-//                        Beauty
-//
-//
-//                    pt-distribution
-//____________________________________________________________
-Double_t AliGenMUONlib::PtBeauty( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::YBeautyF0M0S5PP( const Double_t *px, const Double_t */*dummy*/)
 {
-// Beauty pT
-  const Double_t kpt0 = 4.;
-  const Double_t kxn  = 3.6;
-  Double_t x=*px;
-  //
-  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
-  return x/TMath::Power(pass1,kxn);
+// Beauty y
+// Corresponding NLO total cross section is 0.536 mb
+    Double_t x=px[0];
+    Double_t c[2]={1.2886e-02,8.2912e-05};
+    Double_t y=1-c[0]*TMath::Power(x,2)-c[1]*TMath::Power(x,4);
+    Double_t ybeauty;
+    
+    if (TMath::Abs(x)>7.6) {
+      ybeauty=0.;
+    }
+    else {
+      ybeauty=TMath::Power(y,3);
+    }
+    
+    return ybeauty;
 }
-//                     y-distribution
-Double_t AliGenMUONlib::YBeauty( Double_t *px, Double_t */*dummy*/)
+Double_t AliGenMUONlib::YBeautyF0M0S6PP( const Double_t *px, const Double_t */*dummy*/)
 {
 // Beauty y
-    Double_t *dum=0;
-    return YJpsi(px,dum);
+// Corresponding NLO total cross section is 0.420 mb
+    Double_t x=px[0];
+    Double_t c[2]={1.3106e-02,8.0115e-05};
+    Double_t y=1-c[0]*TMath::Power(x,2)-c[1]*TMath::Power(x,4);
+    Double_t ybeauty;
+    
+    if (TMath::Abs(x)>7.6) {
+      ybeauty=0.;
+    }
+    else {
+      ybeauty=TMath::Power(y,3);
+    }
+    
+    return ybeauty;
 }
 
 Int_t AliGenMUONlib::IpBeauty(TRandom *ran)
@@ -688,22 +2089,34 @@ 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*);
+
+typedef Double_t (*GenFunc) (const Double_t*,  const Double_t*);
 GenFunc AliGenMUONlib::GetPt(Int_t param,  const char* tname) const
 {
 // Return pointer to pT parameterisation
@@ -722,11 +2135,33 @@ GenFunc AliGenMUONlib::GetPt(Int_t param,  const char* tname) const
 	break;
     case kJpsiFamily:
     case kPsiP:
+    case kChic1:
+    case kChic2:
     case kJpsi:
 	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 == "CDF pp 10") {
+	    func=PtJpsiCDFscaledPP10;
+	} else if (sname == "CDF pp 8.8") {
+	    func=PtJpsiCDFscaledPP9;
+	} else if (sname == "CDF pp 7" || sname == "CDF pp 7 flat y") {
+	    func=PtJpsiCDFscaledPP7;
+	} else if (sname == "CDF pp 3.94") {
+	    func=PtJpsiCDFscaledPP4;
+	} else if (sname == "CDF pPb 8.8") {
+	    func=PtJpsiCDFscaledPPb9;
+	} else if (sname == "CDF Pbp 8.8") {
+	    func=PtJpsiCDFscaledPbP9;
+	} else if (sname == "CDF PbPb 3.94") {
+	    func=PtJpsiCDFscaledPbPb4;
+	} else if (sname == "Flat" || sname == "CDF pp 7 flat pt") {
+	    func=PtJpsiFlat;
 	} else {
 	    func=PtJpsi;
 	}
@@ -742,15 +2177,87 @@ GenFunc AliGenMUONlib::GetPt(Int_t param,  const char* tname) const
 	    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 == "CDF pp 10") {
+	    func=PtUpsilonCDFscaledPP10;
+	} else if (sname == "CDF pp 8.8") {
+	    func=PtUpsilonCDFscaledPP9;
+	} else if (sname == "CDF pp 7") {
+	    func=PtUpsilonCDFscaledPP7;
+	} else if (sname == "CDF pp 3.94") {
+	    func=PtUpsilonCDFscaledPP4;
+	} else if (sname == "CDF pPb 8.8") {
+	    func=PtUpsilonCDFscaledPPb9;
+	} else if (sname == "CDF Pbp 8.8") {
+	    func=PtUpsilonCDFscaledPbP9;
+	} else if (sname == "CDF PbPb 3.94") {
+	    func=PtUpsilonCDFscaledPbPb4;
+	} else if (sname == "Flat") {
+	    func=PtUpsilonFlat;
 	} else {
 	    func=PtUpsilon;
 	}
 	break;  
     case kCharm:
-	func=PtCharm;
+	if (sname == "F0M0S0 pp") {
+	    func=PtCharmF0M0S0PP;
+	} else if (sname == "F1M0S0 pp") {
+	    func=PtCharmF1M0S0PP;
+	} else if (sname == "F2M0S0 pp") {
+	    func=PtCharmF2M0S0PP;
+	} else if (sname == "F0M1S0 pp") {
+	    func=PtCharmF0M1S0PP;
+	} else if (sname == "F0M2S0 pp") {
+	    func=PtCharmF0M2S0PP;
+	} else if (sname == "F0M0S1 pp") {
+	    func=PtCharmF0M0S1PP;
+	} else if (sname == "F0M0S2 pp") {
+	    func=PtCharmF0M0S2PP;
+	} else if (sname == "F0M0S3 pp") {
+	    func=PtCharmF0M0S3PP;
+	} else if (sname == "F0M0S4 pp") {
+	    func=PtCharmF0M0S4PP;
+	} else if (sname == "F0M0S5 pp") {
+	    func=PtCharmF0M0S5PP;
+	} else if (sname == "F0M0S6 pp") {
+	    func=PtCharmF0M0S6PP;
+	} else if (sname == "central") {
+	    func=PtCharmCentral;
+	} else {
+	    func=PtCharm;
+	}
 	break;
     case kBeauty:
-	func=PtBeauty;
+	if (sname == "F0M0S0 pp") {
+	    func=PtBeautyF0M0S0PP;
+	} else if (sname == "F1M0S0 pp") {
+	    func=PtBeautyF1M0S0PP;
+	} else if (sname == "F2M0S0 pp") {
+	    func=PtBeautyF2M0S0PP;
+	} else if (sname == "F0M1S0 pp") {
+	    func=PtBeautyF0M1S0PP;
+	} else if (sname == "F0M2S0 pp") {
+	    func=PtBeautyF0M2S0PP;
+	} else if (sname == "F0M0S1 pp") {
+	    func=PtBeautyF0M0S1PP;
+	} else if (sname == "F0M0S2 pp") {
+	    func=PtBeautyF0M0S2PP;
+	} else if (sname == "F0M0S3 pp") {
+	    func=PtBeautyF0M0S3PP;
+	} else if (sname == "F0M0S4 pp") {
+	    func=PtBeautyF0M0S4PP;
+	} else if (sname == "F0M0S5 pp") {
+	    func=PtBeautyF0M0S5PP;
+	} else if (sname == "F0M0S6 pp") {
+	    func=PtBeautyF0M0S6PP;
+	} else if (sname == "central") {
+	    func=PtBeautyCentral;
+	} else {
+	    func=PtBeauty;
+	}
 	break;
     case kPion:
 	func=PtPion;
@@ -758,6 +2265,12 @@ GenFunc AliGenMUONlib::GetPt(Int_t param,  const char* tname) const
     case kKaon:
 	func=PtKaon;
 	break;
+    case kChic0:
+	func=PtChic0;
+	break;
+    case kChic:
+	func=PtChic;
+	break;
     default:
         func=0;
         printf("<AliGenMUONlib::GetPt> unknown parametrisation\n");
@@ -767,9 +2280,10 @@ GenFunc AliGenMUONlib::GetPt(Int_t param,  const char* tname) const
 
 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) 
     {
@@ -784,11 +2298,33 @@ GenFunc AliGenMUONlib::GetY(Int_t param, const char* tname) const
 	break;
     case kJpsiFamily:
     case kPsiP:
+    case kChic1:
+    case kChic2:
     case kJpsi:
 	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 == "CDF pp 10") {
+	    func=YJpsiCDFscaledPP10;
+	} else if (sname == "CDF pp 8.8") {
+	    func=YJpsiCDFscaledPP9;
+	} else if (sname == "CDF pp 7" || sname == "CDF pp 7 flat pt") {
+	    func=YJpsiCDFscaledPP7;
+	} else if (sname == "CDF pp 3.94") {
+	    func=YJpsiCDFscaledPP4;
+	} else if (sname == "CDF pPb 8.8") {
+	    func=YJpsiCDFscaledPPb9;
+	} else if (sname == "CDF Pbp 8.8") {
+	    func=YJpsiCDFscaledPbP9;
+	} else if (sname == "CDF PbPb 3.94") {
+	    func=YJpsiCDFscaledPbPb4;
+	} else if (sname == "Flat" || sname == "CDF pp 7 flat y") {
+	    func=YJpsiFlat;
 	} else {
 	    func=YJpsi;
 	}
@@ -804,15 +2340,83 @@ GenFunc AliGenMUONlib::GetY(Int_t param, const char* tname) const
 	    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 == "CDF pp 10") {
+	    func=YUpsilonCDFscaledPP10;
+	} else if (sname == "CDF pp 8.8") {
+	    func=YUpsilonCDFscaledPP9;
+	} else if (sname == "CDF pp 7") {
+	    func=YUpsilonCDFscaledPP7;
+	} else if (sname == "CDF pp 3.94") {
+	    func=YUpsilonCDFscaledPP4;
+	} else if (sname == "CDF pPb 8.8") {
+	    func=YUpsilonCDFscaledPPb9;
+	} else if (sname == "CDF Pbp 8.8") {
+	    func=YUpsilonCDFscaledPbP9;
+	} else if (sname == "CDF PbPb 3.94") {
+	    func=YUpsilonCDFscaledPbPb4;
+	} else if (sname == "Flat") {
+	    func=YUpsilonFlat;
 	} else {
 	    func=YUpsilon;
 	}
 	break;
     case kCharm:
-	func=YCharm;
+	if (sname == "F0M0S0 pp") {
+	    func=YCharmF0M0S0PP;
+	} else if (sname == "F1M0S0 pp") {
+	    func=YCharmF1M0S0PP;
+	} else if (sname == "F2M0S0 pp") {
+	    func=YCharmF2M0S0PP;
+	} else if (sname == "F0M1S0 pp") {
+	    func=YCharmF0M1S0PP;
+	} else if (sname == "F0M2S0 pp") {
+	    func=YCharmF0M2S0PP;
+	} else if (sname == "F0M0S1 pp") {
+	    func=YCharmF0M0S1PP;
+	} else if (sname == "F0M0S2 pp") {
+	    func=YCharmF0M0S2PP;
+	} else if (sname == "F0M0S3 pp") {
+	    func=YCharmF0M0S3PP;
+	} else if (sname == "F0M0S4 pp") {
+	    func=YCharmF0M0S4PP;
+	} else if (sname == "F0M0S5 pp") {
+	    func=YCharmF0M0S5PP;
+	} else if (sname == "F0M0S6 pp") {
+	    func=YCharmF0M0S6PP;
+	} else {
+	    func=YCharm;
+	}
 	break;
     case kBeauty:
-	func=YBeauty;
+	if (sname == "F0M0S0 pp") {
+	    func=YBeautyF0M0S0PP;
+	} else if (sname == "F1M0S0 pp") {
+	    func=YBeautyF1M0S0PP;
+	} else if (sname == "F2M0S0 pp") {
+	    func=YBeautyF2M0S0PP;
+	} else if (sname == "F0M1S0 pp") {
+	    func=YBeautyF0M1S0PP;
+	} else if (sname == "F0M2S0 pp") {
+	    func=YBeautyF0M2S0PP;
+	} else if (sname == "F0M0S1 pp") {
+	    func=YBeautyF0M0S1PP;
+	} else if (sname == "F0M0S2 pp") {
+	    func=YBeautyF0M0S2PP;
+	} else if (sname == "F0M0S3 pp") {
+	    func=YBeautyF0M0S3PP;
+	} else if (sname == "F0M0S4 pp") {
+	    func=YBeautyF0M0S4PP;
+	} else if (sname == "F0M0S5 pp") {
+	    func=YBeautyF0M0S5PP;
+	} else if (sname == "F0M0S6 pp") {
+	    func=YBeautyF0M0S6PP;
+	} else {
+	    func=YBeauty;
+	}
 	break;
     case kPion:
 	func=YPion;
@@ -820,12 +2424,165 @@ GenFunc AliGenMUONlib::GetY(Int_t param, const char* tname) const
     case kKaon:
 	func=YKaon;
 	break;
+    case kChic0:
+	func=YChic0;
+	break;
+    case kChic:
+	func=YChic;
+	break;
     default:
         func=0;
         printf("<AliGenMUONlib::GetY> unknown parametrisation\n");
     }
     return func;
 }
+
+//
+//                    Chi
+//
+//
+//                pt-distribution
+//____________________________________________________________
+Double_t AliGenMUONlib::PtChic0( const Double_t *px, const Double_t */*dummy*/)
+{
+// Chi_c1 pT
+  const Double_t kpt0 = 4.;
+  const Double_t kxn  = 3.6;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+Double_t AliGenMUONlib::PtChic1( const Double_t *px, const Double_t */*dummy*/)
+{
+// Chi_c1 pT
+  const Double_t kpt0 = 4.;
+  const Double_t kxn  = 3.6;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+Double_t AliGenMUONlib::PtChic2( const Double_t *px, const Double_t */*dummy*/)
+{
+// Chi_c2 pT
+  const Double_t kpt0 = 4.;
+  const Double_t kxn  = 3.6;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+Double_t AliGenMUONlib::PtChic( const Double_t *px, const Double_t */*dummy*/)
+{
+// Chi_c family pT
+  const Double_t kpt0 = 4.;
+  const Double_t kxn  = 3.6;
+  Double_t x=*px;
+  //
+  Double_t pass1 = 1.+(x/kpt0)*(x/kpt0);
+  return x/TMath::Power(pass1,kxn);
+}
+
+//
+//               y-distribution
+//____________________________________________________________
+Double_t AliGenMUONlib::YChic0(const Double_t *py, const Double_t */*dummy*/)
+{
+// Chi-1c y
+  const Double_t ky0 = 4.;
+ const Double_t kb=1.;
+  Double_t yj;
+  Double_t y=TMath::Abs(*py);
+  //
+  if (y < ky0)
+    yj=kb;
+  else
+    yj=kb*TMath::Exp(-(y-ky0)*(y-ky0)/2);
+  return yj;
+}
+
+Double_t AliGenMUONlib::YChic1(const Double_t *py, const Double_t */*dummy*/)
+{
+// Chi-1c y
+  const Double_t ky0 = 4.;
+  const Double_t kb=1.;
+  Double_t yj;
+  Double_t y=TMath::Abs(*py);
+  //
+  if (y < ky0)
+    yj=kb;
+  else
+    yj=kb*TMath::Exp(-(y-ky0)*(y-ky0)/2);
+  return yj;
+}
+
+Double_t AliGenMUONlib::YChic2(const Double_t *py, const Double_t */*dummy*/)
+{
+// Chi-2c y
+  const Double_t ky0 = 4.;
+  const Double_t kb=1.;
+  Double_t yj;
+  Double_t y=TMath::Abs(*py);
+  //
+  if (y < ky0)
+    yj=kb;
+  else
+    yj=kb*TMath::Exp(-(y-ky0)*(y-ky0)/2);
+  return yj;
+}
+
+Double_t AliGenMUONlib::YChic(const Double_t *py, const Double_t */*dummy*/)
+{
+// Chi_c family y
+  const Double_t ky0 = 4.;
+  const Double_t kb=1.;
+  Double_t yj;
+  Double_t y=TMath::Abs(*py);
+  //
+  if (y < ky0)
+    yj=kb;
+  else
+    yj=kb*TMath::Exp(-(y-ky0)*(y-ky0)/2);
+  return yj;
+}
+
+//                 particle composition
+//
+Int_t AliGenMUONlib::IpChic0(TRandom *)
+{
+// Chi composition
+    return 10441;
+}
+//
+Int_t AliGenMUONlib::IpChic1(TRandom *)
+{
+// Chi composition
+    return 20443;
+}
+Int_t AliGenMUONlib::IpChic2(TRandom *)
+{
+// Chi_c2 prime composition
+    return 445;
+}
+Int_t AliGenMUONlib::IpChic(TRandom *)
+{
+// Chi composition
+  Int_t ip;
+  Float_t r = gRandom->Rndm();
+  if (r < 0.001) {
+    ip = 10441;
+  } else if( r < 0.377 ) {
+    ip = 20443;
+  } else {
+    ip = 445;
+  }
+  return ip;
+}
+
+
+//_____________________________________________________________
+
 typedef Int_t (*GenFuncIp) (TRandom *);
 GenFuncIp AliGenMUONlib::GetIp(Int_t param,  const char* /*tname*/) const
 {
@@ -876,6 +2633,18 @@ GenFuncIp AliGenMUONlib::GetIp(Int_t param,  const char* /*tname*/) const
     case kKaon:
 	func=IpKaon;
 	break;
+    case kChic0:
+	func=IpChic0;
+	break;
+    case kChic1:
+	func=IpChic1;
+	break;
+    case kChic2:
+	func=IpChic2;
+	break;
+    case kChic:
+        func=IpChic;
+        break;
     default:
         func=0;
         printf("<AliGenMUONlib::GetIp> unknown parametrisation\n");