small update

rascanu@ikf.uni-frankfurt.de

diff --git a/EVGEN/AliGenEMlib.cxx b/EVGEN/AliGenEMlib.cxx
index 515b04f7f44899af4f5be67ee7c23637ceabd22b..950512a91ee88d2b32f18d076763066008af7bb6 100644 (file)
--- a/EVGEN/AliGenEMlib.cxx
+++ b/EVGEN/AliGenEMlib.cxx
@@ -957,6 +957,7 @@ Double_t AliGenEMlib::PtEta( const Double_t *px, const Double_t */*dummy*/ )
       km = 0.547853; kc = 3.060; kT = 0.212; kn = 6.578;
       return PtTsallis(*px,km,kc,kT,kn);
       break;
+    case kEtaMtScal:
     default:
       return MtScal(*px,kEta);
     }
@@ -976,6 +977,7 @@ Double_t AliGenEMlib::PtEta( const Double_t *px, const Double_t */*dummy*/ )
       km = 0.547853; kc = 2.802; kT = 0.164; kn = 5.815;
       return PtTsallis(*px,km,kc,kT,kn);
       break;
+    case kEtaMtScal:
     default:
       return MtScal(*px,kEta);
       break;
@@ -1076,6 +1078,7 @@ Double_t AliGenEMlib::PtOmega( const Double_t *px, const Double_t */*dummy*/ )
       km = 0.78265; kc = 0.340051/(2*TMath::Pi()); kT = 0.206; kn = 6.31422;
       return PtTsallis(*px,km,kc,kT,kn);
       break;
+    case kOmegaMtScal:
     default:
       return MtScal(*px,kOmega);
     }
@@ -1177,6 +1180,7 @@ Double_t AliGenEMlib::PtPhi( const Double_t *px, const Double_t */*dummy*/ )
       km = 1.01946; kc = 0.0269578/(2*TMath::Pi()); kT = 0.2718119311; kn = 6.6755739295;
       return PtTsallis(*px,km,kc,kT,kn);
       break;
+    case kPhiMtScal:
     default:
       return MtScal(*px,kPhi);
     }

diff --git a/EVGEN/AliGenEMlib.h b/EVGEN/AliGenEMlib.h
index 208022806855e8e9774f8b7e15057c853b792f68..d160d9291d878933013da6462b55030a4247ba97 100644 (file)
--- a/EVGEN/AliGenEMlib.h
+++ b/EVGEN/AliGenEMlib.h
@@ -21,30 +21,30 @@ class TRandom;
 class AliGenEMlib :public AliGenLib {
 public:
 
-  enum Particle_t{ kPizero=0x0, kEta=0x1, kRho0=0x2, kOmega=0x3, kEtaprime=0x4, kPhi=0x5, kJpsi=0x6,
-                  kSigma0=0x7, kK0s=0x8, kDeltaPlPl=0x9, kDeltaPl=0xA, kDeltaMi=0xB, kDeltaZero=0xC,
-                  kRhoPl =0xD, kRhoMi=0xE, kK0star=0xF, kDirectRealGamma=0x10, kDirectVirtGamma=0x11 };
+  enum Particle_t{ kPizero=0, kEta=1, kRho0=2, kOmega=3, kEtaprime=4, kPhi=5, kJpsi=6,
+                  kSigma0=7, kK0s=8, kDeltaPlPl=9, kDeltaPl=10, kDeltaMi=11, kDeltaZero=12,
+                  kRhoPl=13, kRhoMi=14, kK0star=15, kDirectRealGamma=16, kDirectVirtGamma=17 };
   
   enum CollisionSystem_t {kpp900GeV=0x000, kpp2760GeV=0x100, kpp7TeV=0x200, kpPb=0x300, kPbPb=0x400};
 
   enum Centrality_t{ kpp = 0x0, k0005=0x1, k0510=0x2, k1020=0x3, k2030=0x4, k3040=0x5, k4050=0x6, k5060=0x7,
                     k0010=0x8, k2040=0x9, k4060=0xA, k6080=0xB, k0020=0xC, k0040=0xD, k2080=0xE, k4080=0xF, kCentralities=0x10};
   
-  enum PtParamSetPi0_t{ kPizeroParam=0x0, kPizeroParamlow=0x1, kPizeroParamhigh=0x2, kPichargedParam=0x3,
-                       kPichargedParamlow=0x4, kPichargedParamhigh=0x5, kPizeroParamAlter=0x6,
-                       kPizeroParamAlterlow=0x7, kPizeroParamAlterhigh=0x8, kNPi0Param=0x9,
-                       kPichargedParamNew=0xA, kPichargedParamOld=0xB };
+  enum PtParamSetPi0_t{ kPizeroParam, kPizeroParamlow, kPizeroParamhigh, kPichargedParam,
+                       kPichargedParamlow, kPichargedParamhigh, kPizeroParamAlter,
+                       kPizeroParamAlterlow, kPizeroParamAlterhigh, kNPi0Param,
+                       kPichargedParamNew, kPichargedParamOld };
   
-  enum PtParamSetEta_t{ kEtaParampp=0x0, kEtaParampplow=0x1, kEtaParampphigh=0x2,
-                       kEtaParamRatiopp=0x3, kEtaParamRatiopplow=0x4, kEtaParamRatiopphigh=0x5,
-                       kEtaParamPbPb=0x6, kEtaParamPPb=0x7 };
+  enum PtParamSetEta_t{ kEtaMtScal=0, kEtaParampp, kEtaParampplow, kEtaParampphigh,
+                       kEtaParamRatiopp, kEtaParamRatiopplow, kEtaParamRatiopphigh,
+                       kEtaParamPbPb, kEtaParamPPb };
   
-  enum PtParamSetOmega_t{ kOmegaParampp=0x0, kOmegaParampplow=0x1, kOmegaParampphigh=0x2,
-                         kOmegaParamRatiopp=0x3, kOmegaParamRatiopplow=0x4, kOmegaParamRatiopphigh=0x5,
-                         kOmegaParamPbPb=0x6, kOmegaParamPPb=0x7 };
+  enum PtParamSetOmega_t{ kOmegaMtScal=0, kOmegaParampp, kOmegaParampplow, kOmegaParampphigh,
+                         kOmegaParamRatiopp, kOmegaParamRatiopplow, kOmegaParamRatiopphigh,
+                         kOmegaParamPbPb, kOmegaParamPPb };
   
-  enum PtParamSetPhi_t{ kPhiParampp=0x0, kPhiParampplow=0x1, kPhiParampphigh=0x2,
-                       kPhiParamPbPb=0x3, kPhiParamPPb=0x4 };
+  enum PtParamSetPhi_t{ kPhiMtScal=0, kPhiParampp, kPhiParampplow, kPhiParampphigh,
+                       kPhiParamPbPb, kPhiParamPPb };
   
   enum v2Sys_t{kLoV2Sys=-1, kNoV2Sys=0, kUpV2Sys=+1};