#101195 Request to port commits 61820, 61821, 61832 (needed for HF p-…

…Pb MC simulations) to the release branch
sevdokim · Apr 16, 2013 · edea139 · edea139
1 parent eb5e995
commit edea139
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/EVGEN/AliGenCocktail.cxx b/EVGEN/AliGenCocktail.cxx
@@ -64,7 +64,7 @@ AliGenCocktail::~AliGenCocktail()
 }
 
 void AliGenCocktail::
-AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp, TFormula* formula)
+AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp, TFormula* formula, Int_t ntimes)
 {
 //
 // Add a generator to the list 
@@ -102,7 +102,8 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp, TFormul
 
     AliGenCocktailEntry *entry = 
 	new AliGenCocktailEntry(Generator, Name, RateExp);
-    if (formula) entry->SetFormula(formula);    
+    if (formula) entry->SetFormula(formula);  
+    entry->SetNTimes(ntimes);
      fEntries->Add(entry);
      fNGenerators++;
      flnk1 = 0;
@@ -186,7 +187,7 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp, TFormul
 	// Loop over generators and generate events
 	Int_t igen   = 0;
 	while((entry = (AliGenCocktailEntry*)next())) {
-          Int_t ntimes = 1;
+          Int_t ntimes = entry->NTimes();
 	  if (fUsePerEventRate && (gRandom->Rndm() > entry->Rate())) continue;
 
 	  igen++;

diff --git a/EVGEN/AliGenCocktail.h b/EVGEN/AliGenCocktail.h
@@ -35,7 +35,7 @@ class AliGenCocktail : public AliGenerator
     //
     // Add a new generator to the list
     virtual void AddGenerator
-      (AliGenerator *Generator, const char* Name, Float_t RateExp, TFormula* formula = 0);
+      (AliGenerator *Generator, const char* Name, Float_t RateExp, TFormula* formula = 0, Int_t ntimes = 1);
     virtual TList* Entries() {return fEntries;}
     // Iterators
     AliGenCocktailEntry*  FirstGenerator();

diff --git a/EVGEN/AliGenCocktailEntry.cxx b/EVGEN/AliGenCocktailEntry.cxx
@@ -35,6 +35,7 @@ AliGenCocktailEntry::AliGenCocktailEntry():
     fFirst(-1),
     fLast(-1),
     fRate(0),
+    fNTimes(1),
     fKineBias(1),
     fBias(1),
     fFormula(0)
@@ -51,6 +52,7 @@ AliGenCocktailEntry:: AliGenCocktailEntry
   fFirst(-1),
   fLast(-1),
   fRate(RateExp),
+  fNTimes(1),
   fKineBias(1),
   fBias(1),
   fFormula(0)
@@ -65,6 +67,7 @@ AliGenCocktailEntry::AliGenCocktailEntry(const AliGenCocktailEntry &entry):
     fFirst(-1),
     fLast(-1),
     fRate(0),
+    fNTimes(1),
     fKineBias(1),
     fBias(1),
     fFormula(0)

diff --git a/EVGEN/AliGenCocktailEntry.h b/EVGEN/AliGenCocktailEntry.h
@@ -25,11 +25,13 @@ class AliGenCocktailEntry : public TNamed
     AliGenerator* Generator() {return fGenerator;}
     void SetGenerator(AliGenerator* generator){fGenerator=generator;}
     void SetFormula(TFormula* formula) {fFormula = formula;}
+    void SetNTimes(Int_t ntimes) {fNTimes = ntimes;}
     void SetFirst(Int_t first) {fFirst=first;}
     void SetLast (Int_t last ) {fLast =last;}
     Int_t GetFirst() const {return fFirst;}
     Int_t GetLast () const {return fLast;}
     Float_t Rate()   const {return fRate;}
+    Int_t NTimes()   const {return fNTimes;}
     Int_t   Bin()    const {return Int_t(fRate);}
     void  PrintInfo() const;
     TFormula* Formula() const {return fFormula;}
@@ -40,12 +42,13 @@ class AliGenCocktailEntry : public TNamed
     Int_t fFirst;               // First index in list of primaries
     Int_t fLast;                // Last index in list of primaries
     Float_t fRate;              // Rate per event
+    Int_t   fNTimes;            // Generate is called N times
     Float_t fKineBias;          // Bias due to kinematic selecion
     Float_t fBias;              // Bias
     TFormula* fFormula;         // Formula to calculate number of signals per event    
     void Copy(TObject&) const;
  private:
-    ClassDef(AliGenCocktailEntry, 2) // Generator entry of AliGenCocktail
+    ClassDef(AliGenCocktailEntry, 3) // Generator entry of AliGenCocktail
 };
 #endif