X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVGEN%2FAliGenCocktail.h;h=8a1e2790a4f9210fef66a5102d70235818f64593;hb=19563116f18d573fb8aff288c18472053e68f604;hp=013d2716551988fa3ca76894571a88aec233893f;hpb=4f85aa788d96e3a036766ff5b6e191c5c8a669cf;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EVGEN/AliGenCocktail.h b/EVGEN/AliGenCocktail.h
index 013d2716551..8a1e2790a4f 100644
--- a/EVGEN/AliGenCocktail.h
+++ b/EVGEN/AliGenCocktail.h
@@ -12,6 +12,7 @@
 
 #include "AliGenerator.h"
 #include <TArrayF.h>
+#include <TList.h>
 
 class AliGenCocktailEntry;
 class AliGenCocktailEventHeader;
@@ -22,7 +23,6 @@ class AliGenCocktail : public AliGenerator
 {
  public:
     AliGenCocktail();
-    AliGenCocktail(const AliGenCocktail &cocktail);
      
     virtual ~AliGenCocktail();
     virtual void Init();
@@ -30,6 +30,7 @@ class AliGenCocktail : public AliGenerator
     virtual void Generate();
     virtual void SetVertexSmear(VertexSmear_t smear);
     virtual void SetRandomise(Bool_t flag) {fRandom = flag;}
+    virtual void UsePerEventRates() {fUsePerEventRate  = kTRUE;}
 	    
     //
     // Add a new generator to the list
@@ -41,12 +42,13 @@ class AliGenCocktail : public AliGenerator
     AliGenCocktailEntry*  NextGenerator();
     void FirstGeneratorPair(AliGenCocktailEntry*&e1, AliGenCocktailEntry*&e2);
     void NextGeneratorPair (AliGenCocktailEntry*&e1, AliGenCocktailEntry*&e2);
-    AliGenCocktail & operator=(const AliGenCocktail & rhs);
     virtual void AddHeader(AliGenEventHeader* header);
 	    
  protected:
     Int_t fNGenerators;                 // Number of generators booked
+    Float_t fTotalRate;                 // Total rate of the generators booked
     Bool_t fRandom;                     // Flag to select random generator from list
+    Bool_t fUsePerEventRate;            // Flag to generate the events according to the rate per event    
     TArrayF  fProb;                     // Probability of an event (if fRandom == kTRUE)
     TList  *fEntries;                   // List of Generators
     TObjLink *flnk1;                    // ! Iterator for first generator
@@ -55,7 +57,9 @@ class AliGenCocktail : public AliGenerator
 			   
 //
  private:
-    void Copy(TObject &arun) const;
+    AliGenCocktail(const AliGenCocktail &cocktail);
+    AliGenCocktail & operator=(const AliGenCocktail & rhs);
+
     ClassDef(AliGenCocktail,1) // Particle cocktail generator a la SHAKER
 };