Updates for mixing.

[u/mrichter/AliRoot.git] / EVGEN / AliGenCocktail.cxx

diff --git a/EVGEN/AliGenCocktail.cxx b/EVGEN/AliGenCocktail.cxx
index 89a4f66590e2f6cbe9f85321066e8a9d30475927..8afde0b5e10d464ad016b439bcbf137fea4e4fbc 100644 (file)
--- a/EVGEN/AliGenCocktail.cxx
+++ b/EVGEN/AliGenCocktail.cxx
@@ -38,6 +38,7 @@ ClassImp(AliGenCocktail)
 AliGenCocktail::AliGenCocktail()
     :AliGenerator(), 
      fNGenerators(0),
+     fTotalRate(0.),
      fRandom(kFALSE),
      fUsePerEventRate(kFALSE),
      fProb(0),
@@ -67,7 +68,7 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp)
 // Add a generator to the list 
 // First check that list exists
     if (!fEntries) fEntries = new TList();
-
+    fTotalRate += RateExp;
 //
 //  Forward parameters to the new generator
     if(TestBit(kPtRange) && !(Generator->TestBit(kPtRange)) && !(Generator->TestBit(kMomentumRange))) 
@@ -166,7 +167,7 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp)
     
     fHeader = new AliGenCocktailEventHeader("Cocktail Header");
 
-    TObjArray *partArray = gAlice->GetMCApp()->Particles();
+    const TObjArray *partArray = gAlice->GetMCApp()->Particles();
 
 //
 //  Generate the vertex position used by all generators
@@ -231,6 +232,7 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp)
 
 // Event Vertex
     fHeader->SetPrimaryVertex(eventVertex);
+    fHeader->CalcNProduced();
     gAlice->SetGenEventHeader(fHeader); 
 }