Check option for independent vertices.

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

diff --git a/EVGEN/AliGenCocktail.cxx b/EVGEN/AliGenCocktail.cxx
index 084f332be7c78e7a31a92b269085c74754faa32e..89a4f66590e2f6cbe9f85321066e8a9d30475927 100644 (file)
--- a/EVGEN/AliGenCocktail.cxx
+++ b/EVGEN/AliGenCocktail.cxx
@@ -36,24 +36,19 @@
 ClassImp(AliGenCocktail)
 
 AliGenCocktail::AliGenCocktail()
-                 :AliGenerator()
+    :AliGenerator(), 
+     fNGenerators(0),
+     fRandom(kFALSE),
+     fUsePerEventRate(kFALSE),
+     fProb(0),
+     fEntries(0),
+     flnk1(0),
+     flnk2(0), 
+     fHeader(0)
 {
 // Constructor
     fName = "Cocktail";
     fTitle= "Particle Generator using cocktail of generators";
-    flnk1 = 0;
-    flnk2 = 0;
-    fNGenerators=0;
-    fEntries = 0;
-    fRandom  = kFALSE;
-    fHeader  = 0;
-}
-
-AliGenCocktail::AliGenCocktail(const AliGenCocktail & cocktail):
-    AliGenerator(cocktail)
-{
-// Copy constructor
-    cocktail.Copy(*this);
 }
 
 AliGenCocktail::~AliGenCocktail()
@@ -86,12 +81,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);
     
@@ -167,6 +162,8 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp)
     AliGenCocktailEntry *preventry = 0;
     AliGenerator* gen = 0;
     if (fHeader) delete fHeader;
+
+    
     fHeader = new AliGenCocktailEventHeader("Cocktail Header");
 
     TObjArray *partArray = gAlice->GetMCApp()->Particles();
@@ -184,8 +181,9 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp)
        //
        // Loop over generators and generate events
        Int_t igen=0;
-       
        while((entry = (AliGenCocktailEntry*)next())) {
+           if (fUsePerEventRate && (gRandom->Rndm() > entry->Rate())) continue;
+           
            igen++;
            if (igen ==1) {
                entry->SetFirst(0);
@@ -210,7 +208,7 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp)
            entry->SetLast(partArray->GetEntriesFast());
            preventry = entry;
        }  
-    } else {
+    } else if (fRandom) {
        //
        // Select a generator randomly
        //
@@ -227,8 +225,7 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp)
        entry->Generator()->SetVertex(fVertex.At(0), fVertex.At(1), fVertex.At(2));
        entry->Generator()->Generate();
        entry->SetLast(partArray->GetEntriesFast());
-    }
-    
+    } 
     
     next.Reset();
 
@@ -307,18 +304,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");
-}