update to AliTRDpwg1Helper class by Markus

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

diff --git a/EVGEN/AliGenCocktail.cxx b/EVGEN/AliGenCocktail.cxx
index 1b570312cea887a50b1496b04d383dc110f2af5a..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),
@@ -51,21 +52,6 @@ AliGenCocktail::AliGenCocktail()
     fTitle= "Particle Generator using cocktail of generators";
 }
 
-AliGenCocktail::AliGenCocktail(const AliGenCocktail & cocktail):
-    AliGenerator(cocktail), 
-    fNGenerators(0),
-    fRandom(kFALSE),
-    fUsePerEventRate(kFALSE),
-    fProb(0),
-    fEntries(0),
-    flnk1(0),
-    flnk2(0), 
-    fHeader(0)
-{
-// Copy constructor
-    cocktail.Copy(*this);
-}
-
 AliGenCocktail::~AliGenCocktail()
 {
 // Destructor
@@ -82,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))) 
@@ -96,12 +82,12 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp)
        Generator->SetPhiRange(fPhiMin*180/TMath::Pi(),fPhiMax*180/TMath::Pi());
     if (!(Generator->TestBit(kThetaRange))) 
        Generator->SetThetaRange(fThetaMin*180/TMath::Pi(),fThetaMax*180/TMath::Pi());
-    if (!(Generator->TestBit(kVertexRange))) 
+    if (!(Generator->TestBit(kVertexRange))) {
        Generator->SetOrigin(fOrigin[0], fOrigin[1], fOrigin[2]);
-
-    Generator->SetSigma(fOsigma[0], fOsigma[1], fOsigma[2]);
-    Generator->SetVertexSmear(fVertexSmear);
-    Generator->SetVertexSource(kContainer);
+       Generator->SetSigma(fOsigma[0], fOsigma[1], fOsigma[2]);
+       Generator->SetVertexSmear(fVertexSmear);
+       Generator->SetVertexSource(kContainer);
+    }
     Generator->SetTrackingFlag(fTrackIt);
     Generator->SetContainer(this);
     
@@ -181,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
@@ -246,6 +232,7 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp)
 
 // Event Vertex
     fHeader->SetPrimaryVertex(eventVertex);
+    fHeader->CalcNProduced();
     gAlice->SetGenEventHeader(fHeader); 
 }
 
@@ -319,18 +306,7 @@ void AliGenCocktail::AddHeader(AliGenEventHeader* header)
 // Add a header to the list 
     if (fHeader) fHeader->AddHeader(header);
 }
-                             
-AliGenCocktail& AliGenCocktail::operator=(const  AliGenCocktail& rhs)
-{
-// Assignment operator
-    rhs.Copy(*this); 
-    return (*this);
-}
 
-void AliGenCocktail::Copy(TObject &) const
-{
-    Fatal("Copy","Not implemented!\n");
-}