"FORTRAN index" in ptscal calls corrected.

diff --git a/EVGEN/AliGenEMlib.cxx b/EVGEN/AliGenEMlib.cxx
index d01ebf98fff8ef5653e4a48492e2762d2d8d95c4..038c7bc65ca64668e35f2abc0134a21997522ded 100644 (file)
--- a/EVGEN/AliGenEMlib.cxx
+++ b/EVGEN/AliGenEMlib.cxx
@@ -88,7 +88,7 @@ Int_t AliGenEMlib::IpEta(TRandom *)
 Double_t AliGenEMlib::PtEta( const Double_t *px, const Double_t */*dummy*/ )
 {
 // Eta pT
-  return MtScal(*px,2);
+  return MtScal(*px,1);
 }
 
 Double_t AliGenEMlib::YEta( const Double_t *py, const Double_t */*dummy*/ )
@@ -111,7 +111,7 @@ Int_t AliGenEMlib::IpRho(TRandom *)
 Double_t AliGenEMlib::PtRho( const Double_t *px, const Double_t */*dummy*/ )
 {
 // Rho pT
-  return MtScal(*px,3);
+  return MtScal(*px,2);
 }
 
 Double_t AliGenEMlib::YRho( const Double_t *py, const Double_t */*dummy*/ )
@@ -134,7 +134,7 @@ Int_t AliGenEMlib::IpOmega(TRandom *)
 Double_t AliGenEMlib::PtOmega( const Double_t *px, const Double_t */*dummy*/ )
 {
 // Omega pT
-  return MtScal(*px,4);
+  return MtScal(*px,3);
 }
 
 Double_t AliGenEMlib::YOmega( const Double_t *py, const Double_t */*dummy*/ )
@@ -157,7 +157,7 @@ Int_t AliGenEMlib::IpEtaprime(TRandom *)
 Double_t AliGenEMlib::PtEtaprime( const Double_t *px, const Double_t */*dummy*/ )
 {
 // Eta pT
-  return MtScal(*px,5);
+  return MtScal(*px,4);
 }
 
 Double_t AliGenEMlib::YEtaprime( const Double_t *py, const Double_t */*dummy*/ )
@@ -180,7 +180,7 @@ Int_t AliGenEMlib::IpPhi(TRandom *)
 Double_t AliGenEMlib::PtPhi( const Double_t *px, const Double_t */*dummy*/ )
 {
 // Phi pT
-  return MtScal(*px,6);
+  return MtScal(*px,5);
 }
 
 Double_t AliGenEMlib::YPhi( const Double_t *py, const Double_t */*dummy*/ )

diff --git a/EVGEN/AliGenGSIlib.cxx b/EVGEN/AliGenGSIlib.cxx
index b21fbc1904de6cdc31aacaedc3712ffaa3fb5ba7..b28037d1ac65865c723dca2d9abde5cf09393db2 100644 (file)
--- a/EVGEN/AliGenGSIlib.cxx
+++ b/EVGEN/AliGenGSIlib.cxx
@@ -546,7 +546,7 @@ Double_t AliGenGSIlib::PtEtaPHOS( const Double_t *px, const Double_t */*dummy*/
 //
 //____________________________________________________________--------------
 
-  return PtScal(*px,3);  //  3==> Eta in the PtScal function
+  return PtScal(*px,2);  //  2==> Eta in the PtScal function
    
 }
 Double_t AliGenGSIlib::YEtaPHOS(const Double_t *py, const Double_t */*dummy*/)
@@ -590,7 +590,7 @@ Double_t AliGenGSIlib::PtEtaprimePHOS( const Double_t *px, const Double_t */*dum
 //
 //____________________________________________________________--------------
 
-  return PtScal(*px,5);  //  5==> Etaprime in the PtScal function
+  return PtScal(*px,4);  //  4==> Etaprime in the PtScal function
    
 }
 Double_t AliGenGSIlib::YEtaprimePHOS(const Double_t *py, const Double_t */*dummy*/)
@@ -634,7 +634,7 @@ Double_t AliGenGSIlib::PtOmega( const Double_t *px, const Double_t */*dummy*/ )
 //
 //____________________________________________________________--------------
 
-  return PtScal(*px,4);  //  4==> Omega in the PtScal function
+  return PtScal(*px,3);  //  3==> Omega in the PtScal function
    
 }
 Double_t AliGenGSIlib::YOmega(const Double_t *py, const Double_t */*dummy*/)
@@ -680,7 +680,7 @@ Double_t AliGenGSIlib::PtRho( const Double_t *px, const Double_t */*dummy*/ )
 //
 //____________________________________________________________--------------
 
-  return PtScal(*px,11);  //  11==> Rho in the PtScal function
+  return PtScal(*px,10);  //  10==> Rho in the PtScal function
    
 }
 Double_t AliGenGSIlib::YRho(const Double_t *py, const Double_t */*dummy*/)
@@ -823,7 +823,7 @@ Double_t AliGenGSIlib::PtKaonPHOS( const Double_t *px, const Double_t */*dummy*/
 //
 //____________________________________________________________--------------
 
-  return PtScal(*px,2);  //  2==> Kaon in the PtScal function
+  return PtScal(*px,1);  //  1==> Kaon in the PtScal function
    
 }
 Double_t AliGenGSIlib::YKaonPHOS(const Double_t *py, const Double_t */*dummy*/)
@@ -867,7 +867,7 @@ Double_t AliGenGSIlib::PtPhiPHOS( const Double_t *px, const Double_t */*dummy*/
 //
 //____________________________________________________________--------------
 
-  return PtScal(*px,6);  //  6==> Phi in the PtScal function
+  return PtScal(*px,5);  //  5==> Phi in the PtScal function
    
 }
 Double_t AliGenGSIlib::YPhiPHOS(const Double_t *py, const Double_t */*dummy*/)
@@ -928,7 +928,7 @@ Double_t AliGenGSIlib::PtBaryons( const Double_t *px, const Double_t */*dummy*/
 //
 //____________________________________________________________--------------
 
-  return PtScal(*px,7);  //  7==> Baryon in the PtScal function
+  return PtScal(*px,6);  //  6==> Baryon in the PtScal function
    
 }
 Double_t AliGenGSIlib::YBaryons(const Double_t *py, const Double_t */*dummy*/)
@@ -969,8 +969,8 @@ Double_t AliGenGSIlib::YBaryons(const Double_t *py, const Double_t */*dummy*/)
 
 // The present adds the Rhos
 
-// MASS   1=>PI, 2=>K, 3=>ETA, 4=>OMEGA, 5=>ETA', 6=>PHI 
-//        7=>BARYON-BARYONBAR, 11==>RHO
+// MASS   0=>PI, 1=>K, 2=>ETA, 3=>OMEGA, 4=>ETA', 5=>PHI 
+//        6=>BARYON-BARYONBAR, 10==>RHO
 
   const Double_t khm[11] = {0.1396, 0.494,  0.547,    0.782,   0.957,   1.02, 
                                          0.938, 0. , 0., 0., 0.769};

diff --git a/EVGEN/AliGenMUONlib.cxx b/EVGEN/AliGenMUONlib.cxx
index 17021148f413f8cc0322806a45499164d6e5d2db..617b9438d49d1b24a03b541a5b1e0707edaf39d1 100644 (file)
--- a/EVGEN/AliGenMUONlib.cxx
+++ b/EVGEN/AliGenMUONlib.cxx
@@ -114,7 +114,7 @@ Double_t AliGenMUONlib::PtScal(Double_t pt, Int_t np)
 Double_t AliGenMUONlib::PtKaon( const Double_t *px, const Double_t */*dummy*/)
 {
 // Kaon pT
-  return PtScal(*px,2);
+  return PtScal(*px,1);
 }
 
 // y-distribution
@@ -1160,7 +1160,7 @@ Int_t AliGenMUONlib::IpUpsilonFamily(TRandom *)
 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( const Double_t *px, const Double_t */*dummy*/)
@@ -1186,7 +1186,7 @@ Int_t AliGenMUONlib::IpPhi(TRandom *)
 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*/)
@@ -1213,7 +1213,7 @@ Int_t AliGenMUONlib::IpOmega(TRandom *)
 Double_t AliGenMUONlib::PtEta( const Double_t *px, const Double_t */*dummy*/)
 {
 // Eta pT
-  return PtScal(*px,3);
+  return PtScal(*px,2);
 }
 //    y-distribution
 Double_t AliGenMUONlib::YEta( const Double_t *px, const Double_t */*dummy*/)

diff --git a/EVGEN/AliGenPHOSlib.cxx b/EVGEN/AliGenPHOSlib.cxx
index 2cd31b549bc231a7bb453fd6614c6a05f6f45028..9d4d81c274317f2076eac5fc19af281fe0cfaddc 100644 (file)
--- a/EVGEN/AliGenPHOSlib.cxx
+++ b/EVGEN/AliGenPHOSlib.cxx
@@ -166,9 +166,9 @@ Double_t AliGenPHOSlib::YPi0Flat( const Double_t */*py*/, const Double_t *)
 //      7=>BARYONS-BARYONBARS
 
   //    SCALING EN MASSE PAR RAPPORT A PTPI
-  //    MASS                1=>PI,  2=>K, 3=>ETA, 4=>OMEGA,  5=>ETA',6=>PHI
+  //    MASS                0=>PI,  1=>K, 2=>ETA, 3=>OMEGA,  4=>ETA',5=>PHI
   const Double_t khm[10] = {0.1396, 0.494,  0.547,    0.782,   0.957,   1.02, 
-  //    MASS               7=>BARYON-BARYONBAR  
+  //    MASS               6=>BARYON-BARYONBAR  
                                          0.938, 0. , 0., 0.};
   //     VALUE MESON/PI AT 5 GEV
   const Double_t kfmax[10]={1., 1., 1., 1., 1., 1., 1., 1., 1., 1.};
@@ -191,7 +191,7 @@ Double_t AliGenPHOSlib::YPi0Flat( const Double_t */*py*/, const Double_t *)
 //                pt-distribution
 //____________________________________________________________
 
-  return PtScal(*px,2);  //  2==> Kaon in the PtScal function
+  return PtScal(*px,1);  //  1==> Kaon in the PtScal function
 }
 
  Double_t AliGenPHOSlib::YKaon( const Double_t *py, const Double_t *)
@@ -266,7 +266,7 @@ Int_t AliGenPHOSlib::IpKaon0L(TRandom *)
 //                pt-distribution
 //____________________________________________________________
 
-  return PtScal(*px,3);  //  3==> Eta in the PtScal function
+  return PtScal(*px,2);  //  2==> Eta in the PtScal function
 }
 
  Double_t AliGenPHOSlib::YEta( const Double_t *py, const Double_t *)
@@ -333,7 +333,7 @@ Double_t AliGenPHOSlib::YEtaFlat( const Double_t */*py*/, const Double_t *)
 //                pt-distribution
 //____________________________________________________________
 
-  return PtScal(*px,4);  //  4==> Omega in the PtScal function
+  return PtScal(*px,3);  //  3==> Omega in the PtScal function
 }
 
  Double_t AliGenPHOSlib::YOmega( const Double_t *py, const Double_t *)
@@ -401,7 +401,7 @@ Double_t AliGenPHOSlib::YOmegaFlat( const Double_t */*py*/, const Double_t *)
 //                pt-distribution
 //____________________________________________________________
 
-  return PtScal(*px,5);  //  5==> Etaprime in the PtScal function
+  return PtScal(*px,4);  //  4==> Etaprime in the PtScal function
 }
 
  Double_t AliGenPHOSlib::YEtaprime( const Double_t *py, const Double_t *)
@@ -436,7 +436,7 @@ Double_t AliGenPHOSlib::YOmegaFlat( const Double_t */*py*/, const Double_t *)
 //                pt-distribution
 //____________________________________________________________
 
-  return PtScal(*px,6);  //  6==> Phi in the PtScal function
+  return PtScal(*px,5);  //  5==> Phi in the PtScal function
 }
 
  Double_t AliGenPHOSlib::YPhi( const Double_t *py, const Double_t *)
@@ -471,7 +471,7 @@ Double_t AliGenPHOSlib::YOmegaFlat( const Double_t */*py*/, const Double_t *)
 //                pt-distribution
 //____________________________________________________________
 
-  return PtScal(*px,7);  //  7==> Baryon in the PtScal function
+  return PtScal(*px,6);  //  6==> Baryon in the PtScal function
 }
 
  Double_t AliGenPHOSlib::YBaryon( const Double_t *py, const Double_t *)

diff --git a/EVGEN/AliGenPMDlib.cxx b/EVGEN/AliGenPMDlib.cxx
index 0d9173012a0df9d1ca02216dbaf28bb1d0a51d23..f5dbf5399177234f2caced17283d053ae16764dc 100644 (file)
--- a/EVGEN/AliGenPMDlib.cxx
+++ b/EVGEN/AliGenPMDlib.cxx
@@ -117,7 +117,7 @@ Double_t AliGenPMDlib::PtScal(Double_t pt, Int_t np)
 Double_t AliGenPMDlib::PtEta( const Double_t *px, const Double_t */*dummy*/)
 {
 // Kaon pT
-  return PtScal(*px,3);
+  return PtScal(*px,2);
 }
 
 // y-distribution

diff --git a/EVGEN/AliGenSTRANGElib.cxx b/EVGEN/AliGenSTRANGElib.cxx
index ba962f304e8c0683386a74ea6b7e5c3f313b01b0..96d32a22441328b8e8d52f9cc7036f7e750635c2 100644 (file)
--- a/EVGEN/AliGenSTRANGElib.cxx
+++ b/EVGEN/AliGenSTRANGElib.cxx
@@ -59,17 +59,17 @@ ClassImp(AliGenSTRANGElib)
 //     10=>Omega-antiOmega
 
   //    MASS SCALING RESPECT TO PIONS
-  //    MASS                1=>PI,  2=>K, 3=>ETA,4=>OMEGA,5=>ETA',6=>PHI 
+  //    MASS                0=>PI,  1=>K, 2=>ETA,3=>OMEGA,4=>ETA',5=>PHI 
   const Double_t khm[11] = {0.1396, 0.494,0.547, 0.782,   0.957,  1.02, 
-  //    MASS               7=>BARYON-BARYONBAR  
+  //    MASS               6=>BARYON-BARYONBAR  
                                  0.938, 
-  //    MASS               8=>Lambda-antiLambda  
+  //    MASS               7=>Lambda-antiLambda  
                                   1.1157,
-  //    MASS               9=>Xi-antiXi  
+  //    MASS               8=>Xi-antiXi  
                                   1.3213, 
-  //    MASS              10=>Omega-antiOmega  
+  //    MASS               9=>Omega-antiOmega  
                                   1.6725,
-  //    MASS              11=>Lambda(1520)
+  //    MASS              10=>Lambda(1520)
                                   1.5195};
   //     VALUE MESON/PI AT 5 GEV
   const Double_t kfmax[11]={1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.};
@@ -120,7 +120,7 @@ ClassImp(AliGenSTRANGElib)
 //                pt-distribution
 //____________________________________________________________
 
-  return PtScal(*px,2);  //  2==> Kaon in the PtScal function
+  return PtScal(*px,1);  //  1==> Kaon in the PtScal function
 }
 
  Double_t AliGenSTRANGElib::YKaon( const Double_t *py, const Double_t *)
@@ -172,7 +172,7 @@ ClassImp(AliGenSTRANGElib)
 //                pt-distribution
 //____________________________________________________________
 
-  return PtScal(*px,6);  //  6==> Phi in the PtScal function
+  return PtScal(*px,5);  //  5==> Phi in the PtScal function
 }
 
  Double_t AliGenSTRANGElib::YPhi( const Double_t *py, const Double_t *)
@@ -207,7 +207,7 @@ ClassImp(AliGenSTRANGElib)
 //                pt-distribution
 //____________________________________________________________
 
-  return PtScal(*px,8);  //  8==> Lambda-antiLambda in the PtScal function
+  return PtScal(*px,7);  //  7==> Lambda-antiLambda in the PtScal function
 }
 
  Double_t AliGenSTRANGElib::YLambda( const Double_t *py, const Double_t *)
@@ -246,7 +246,7 @@ ClassImp(AliGenSTRANGElib)
 //                pt-distribution
 //____________________________________________________________
 
-  return PtScal(*px,9);  //  9==> Xi-antiXi in the PtScal function
+  return PtScal(*px,8);  //  8==> Xi-antiXi in the PtScal function
 }
 
  Double_t AliGenSTRANGElib::YXiMinus( const Double_t *py, const Double_t *)
@@ -285,7 +285,7 @@ ClassImp(AliGenSTRANGElib)
 //                pt-distribution
 //____________________________________________________________
 
-  return PtScal(*px,10);  //  10==> Omega-antiOmega in the PtScal function
+  return PtScal(*px,9);  //  9==> Omega-antiOmega in the PtScal function
 }
 
  Double_t AliGenSTRANGElib::YOmegaMinus( const Double_t *py, const Double_t *)
@@ -325,7 +325,7 @@ Double_t AliGenSTRANGElib::PtLambda1520( const Double_t *px, const Double_t *)
 //                  pt-distribution
 //____________________________________________________________
 
-  return PtScal(*px,11);   //   11=> Lambda(1520) in the PtScal function
+  return PtScal(*px,10);   //   10=> Lambda(1520) in the PtScal function
 }
 
 Double_t AliGenSTRANGElib::YLambda1520( const Double_t *py, const Double_t *)