Pass() renamed to Rejected()

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

diff --git a/EVGEN/AliGenCocktail.cxx b/EVGEN/AliGenCocktail.cxx
index 4e9a2e9485b91aa4cb09845a88d5b0352a35b8d5..5107d1fb5e9788bd8396da5355e02f708755aeaa 100644 (file)
--- a/EVGEN/AliGenCocktail.cxx
+++ b/EVGEN/AliGenCocktail.cxx
@@ -30,6 +30,7 @@
 #include "AliGenCocktailEntry.h"
 #include "AliCollisionGeometry.h"
 #include "AliRun.h"
+#include "AliMC.h"
 
 ClassImp(AliGenCocktail)
 
@@ -60,7 +61,7 @@ AliGenCocktail::~AliGenCocktail()
 }
 
 void AliGenCocktail::
-AddGenerator(AliGenerator *Generator, char* Name, Float_t RateExp)
+AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp)
 {
 //
 // Add a generator to the list 
@@ -87,11 +88,16 @@ AddGenerator(AliGenerator *Generator, char* Name, Float_t RateExp)
     Generator->SetVertexSmear(fVertexSmear);
     Generator->SetVertexSource(kContainer);
     Generator->SetTrackingFlag(fTrackIt);
+        
 //
 //  Add generator to list   
-    
+    char theName[256];
+    sprintf(theName, "%s_%d",Name, fNGenerators);
+    Generator->SetName(theName);
+
     AliGenCocktailEntry *entry = 
        new AliGenCocktailEntry(Generator, Name, RateExp);
+    
      fEntries->Add(entry);
      fNGenerators++;
  }
@@ -104,6 +110,7 @@ AddGenerator(AliGenerator *Generator, char* Name, Float_t RateExp)
     //
     // Loop over generators and initialize
     while((entry = (AliGenCocktailEntry*)next())) {
+       if (fStack)  entry->Generator()->SetStack(fStack);
        entry->Generator()->Init();
     }  
 }
@@ -129,7 +136,7 @@ AddGenerator(AliGenerator *Generator, char* Name, Float_t RateExp)
     AliGenCocktailEntry *preventry = 0;
     AliGenerator* gen = 0;
 
-    TObjArray *partArray = gAlice->Particles();
+    TObjArray *partArray = gAlice->GetMCApp()->Particles();
 
 //
 //  Generate the vertex position used by all generators
@@ -230,7 +237,7 @@ AliGenCocktail& AliGenCocktail::operator=(const  AliGenCocktail& rhs)
     return (*this);
 }
 
-void AliGenCocktail::Copy(AliGenCocktail &) const
+void AliGenCocktail::Copy(TObject &) const
 {
     Fatal("Copy","Not implemented!\n");
 }