Removing warnings (Sun)

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

diff --git a/EVGEN/AliGenCocktail.cxx b/EVGEN/AliGenCocktail.cxx
index a0d3e9a78b5ef5daf6bcd965385cc59d493cbef1..ce2e5edc743496ea143f27ca4aeccae6d889ad60 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)
 
@@ -39,10 +40,11 @@ AliGenCocktail::AliGenCocktail()
 // Constructor
     fName = "Cocktail";
     fTitle= "Particle Generator using cocktail of generators";
-    fEntries = new TList;
     flnk1 = 0;
     flnk2 = 0;
     fNGenerators=0;
+    fEntries = 0;
+    
 }
 
 AliGenCocktail::AliGenCocktail(const AliGenCocktail & cocktail):
@@ -59,8 +61,13 @@ 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 
+// First check that list exists
+    if (!fEntries) fEntries = new TList();
+
 //
 //  Forward parameters to the new generator
     if(TestBit(kPtRange) && !(Generator->TestBit(kPtRange)) && !(Generator->TestBit(kMomentumRange))) 
@@ -83,9 +90,13 @@ AddGenerator(AliGenerator *Generator, char* Name, Float_t RateExp)
     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++;
  }
@@ -123,7 +134,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
@@ -224,7 +235,7 @@ AliGenCocktail& AliGenCocktail::operator=(const  AliGenCocktail& rhs)
     return (*this);
 }
 
-void AliGenCocktail::Copy(AliGenCocktail &) const
+void AliGenCocktail::Copy(TObject &) const
 {
     Fatal("Copy","Not implemented!\n");
 }