Merge branch master into TRDdev

[u/mrichter/AliRoot.git] / EVGEN / AliGenEMCocktail.h

diff --git a/EVGEN/AliGenEMCocktail.h b/EVGEN/AliGenEMCocktail.h
index 96ed2497244226586eb2947f5de3b1da3db2fe25..89b7a50554e7b723c2c287307c5c01354ece6dd7 100644 (file)
--- a/EVGEN/AliGenEMCocktail.h
+++ b/EVGEN/AliGenEMCocktail.h
@@ -23,7 +23,8 @@ class AliGenEMCocktail : public AliGenCocktail
 public:
 
     AliGenEMCocktail();
-  enum GeneratorCode { kGenPizero=0, kGenEta, kGenRho, kGenOmega, kGenEtaprime, kGenPhi, kGenJpsi, kGenPromptRealGamma, kGenThermRealGamma, kGenPromptVirtGamma, kGenThermVirtGamma, kGENs };
+  enum GeneratorCode { kPizero=0, kEta, kRho, kOmega, kEtaprime, kPhi, kJpsi, kDirectRealGamma, kDirectVirtGamma, kGENs };
+  enum SelectPartice { kGenPizero=0x001, kGenEta=0x002, kGenRho=0x004, kGenOmega=0x008, kGenEtaprime=0x010, kGenPhi=0x020, kGenJpsi=0x040, kGenDirectRealGamma=0x100, kGenDirectVirtGamma=0x200, kGenHadrons=0x7f, kGenGammas=0x300 };
 
     virtual ~AliGenEMCocktail();    
     virtual void Init();
@@ -39,7 +40,7 @@ public:
   void    SetCentrality(Int_t cent){ fCentrality = cent; }
   void    SetV2Systematic(Int_t v2sys){ fV2Systematic = v2sys; }
   void    SetForceGammaConversion(Bool_t force=kTRUE){ fForceConv=force; }
-  void    SetHeaviestParticle(Int_t part){ fHeaviestParticle=part; }
+  void    SelectMotherParticles(Int_t part){ fSelectedParticles=part; }
     
 private:
     AliGenEMCocktail(const AliGenEMCocktail &cocktail); 
@@ -59,7 +60,7 @@ private:
   Int_t fV2Systematic; //selected systematic error for v2 parameters
 
   Bool_t fForceConv; //select whether you want to force all gammas to convert imidediately
-  Int_t fHeaviestParticle; //select up to which particle to simulate
+  Int_t fSelectedParticles; //which particles to simulate
 
     ClassDef(AliGenEMCocktail,1)  //  cocktail for EM physics
 };