SetSeed implementation

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

diff --git a/EVGEN/AliGenCocktail.cxx b/EVGEN/AliGenCocktail.cxx
index 8fb50fa2e0adacb947ad9fa1f97da7f4a00ba245..9219d2950017ab33f09950f22337bf46f22ff2a9 100644 (file)
--- 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;
@@ -120,6 +121,7 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp, TFormul
     // Loop over generators and initialize
     while((entry = (AliGenCocktailEntry*)next())) {
        if (fStack)  entry->Generator()->SetStack(fStack);
+       entry->Generator()->SetSeed(fSeed);
        entry->Generator()->Init();
     }  
 
@@ -186,7 +188,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++;
@@ -231,10 +233,9 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp, TFormul
                ntimes = nsig;
              }
            }
-
-         gen->SetVertex(fVertex.At(0), fVertex.At(1), fVertex.At(2));
+         gen->SetVertex(fVertex.At(0), fVertex.At(1), fVertex.At(2), fTime);
          
-         for (Int_t i = 0; i < ntimes; i++) gen->Generate();
+         gen->GenerateN(ntimes);
          entry->SetLast(partArray->GetEntriesFast());
          preventry = entry;
        }
@@ -252,17 +253,22 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp, TFormul
        entry = (AliGenCocktailEntry*) fEntries->At(i);
        entry->SetFirst(0);
        gen = entry->Generator();
-       gen->SetVertex(fVertex.At(0), fVertex.At(1), fVertex.At(2));
+       gen->SetVertex(fVertex.At(0), fVertex.At(1), fVertex.At(2), fTime);
        gen->Generate();
        entry->SetLast(partArray->GetEntriesFast());
     } 
     
     next.Reset();
 
-// Event Vertex
+    // Event Vertex
     fHeader->SetPrimaryVertex(eventVertex);
     fHeader->CalcNProduced();
-    gAlice->SetGenEventHeader(fHeader); 
+    if (fContainer) {
+      fHeader->SetName(fName);
+      fContainer->AddHeader(fHeader);
+    } else {
+      gAlice->SetGenEventHeader(fHeader);      
+    }
 }
 
 void AliGenCocktail::SetVertexSmear(VertexSmear_t smear)