Option for generation according to subevent rates added.

diff --git a/EVGEN/AliGenCocktail.cxx b/EVGEN/AliGenCocktail.cxx
index 084f332be7c78e7a31a92b269085c74754faa32e..96fa73a36a9e17c361ad8584644edc3e2a19c708 100644 (file)
--- a/EVGEN/AliGenCocktail.cxx
+++ b/EVGEN/AliGenCocktail.cxx
@@ -41,12 +41,13 @@ AliGenCocktail::AliGenCocktail()
 // Constructor
     fName = "Cocktail";
     fTitle= "Particle Generator using cocktail of generators";
 // Constructor
     fName = "Cocktail";
     fTitle= "Particle Generator using cocktail of generators";

-    flnk1 = 0;
-    flnk2 = 0;
-    fNGenerators=0;
-    fEntries = 0;
-    fRandom  = kFALSE;
-    fHeader  = 0;
+    flnk1            = 0;
+    flnk2            = 0;
+    fNGenerators     = 0;
+    fEntries         = 0;
+    fHeader          = 0;
+    fRandom          = kFALSE;
+    fUsePerEventRate = kFALSE;

 }
 
 AliGenCocktail::AliGenCocktail(const AliGenCocktail & cocktail):
 }
 
 AliGenCocktail::AliGenCocktail(const AliGenCocktail & cocktail):


@@ -167,6 +168,8 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp)
     AliGenCocktailEntry *preventry = 0;
     AliGenerator* gen = 0;
     if (fHeader) delete fHeader;
     AliGenCocktailEntry *preventry = 0;
     AliGenerator* gen = 0;
     if (fHeader) delete fHeader;

+
+    

     fHeader = new AliGenCocktailEventHeader("Cocktail Header");
 
     TObjArray *partArray = gAlice->GetMCApp()->Particles();
     fHeader = new AliGenCocktailEventHeader("Cocktail Header");
 
     TObjArray *partArray = gAlice->GetMCApp()->Particles();


@@ -184,8 +187,10 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp)
        //
        // Loop over generators and generate events
        Int_t igen=0;
        //
        // Loop over generators and generate events
        Int_t igen=0;

-       

        while((entry = (AliGenCocktailEntry*)next())) {
        while((entry = (AliGenCocktailEntry*)next())) {

+
+           if (fUsePerEventRate && (gRandom->Rndm() > entry->Rate())) continue;
+           

            igen++;
            if (igen ==1) {
                entry->SetFirst(0);
            igen++;
            if (igen ==1) {
                entry->SetFirst(0);


@@ -210,7 +215,7 @@ AddGenerator(AliGenerator *Generator, const char* Name, Float_t RateExp)
            entry->SetLast(partArray->GetEntriesFast());
            preventry = entry;
        }  
            entry->SetLast(partArray->GetEntriesFast());
            preventry = entry;
        }  

-    } else {
+    } else if (fRandom) {

        //
        // Select a generator randomly
        //
        //
        // Select a generator randomly
        //


@@ -227,8 +232,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());
        entry->Generator()->SetVertex(fVertex.At(0), fVertex.At(1), fVertex.At(2));
        entry->Generator()->Generate();
        entry->SetLast(partArray->GetEntriesFast());

-    }
-    
+    } 

     
     next.Reset();
 
     
     next.Reset();
 

diff --git a/EVGEN/AliGenCocktail.h b/EVGEN/AliGenCocktail.h
index 013d2716551988fa3ca76894571a88aec233893f..4015e778918ec764760b170b1bb345fd5175fe62 100644 (file)
--- a/EVGEN/AliGenCocktail.h
+++ b/EVGEN/AliGenCocktail.h
@@ -30,6 +30,7 @@ class AliGenCocktail : public AliGenerator
     virtual void Generate();
     virtual void SetVertexSmear(VertexSmear_t smear);
     virtual void SetRandomise(Bool_t flag) {fRandom = flag;}
     virtual void Generate();
     virtual void SetVertexSmear(VertexSmear_t smear);
     virtual void SetRandomise(Bool_t flag) {fRandom = flag;}

+    virtual void UsePerEventRates() {fUsePerEventRate  = kTRUE;}

            
     //
     // Add a new generator to the list
            
     //
     // Add a new generator to the list


@@ -47,6 +48,7 @@ class AliGenCocktail : public AliGenerator
  protected:
     Int_t fNGenerators;                 // Number of generators booked
     Bool_t fRandom;                     // Flag to select random generator from list
  protected:
     Int_t fNGenerators;                 // Number of generators booked
     Bool_t fRandom;                     // Flag to select random generator from list

+    Bool_t fUsePerEventRate;            // Flag to generate the events according to the rate per event    

     TArrayF  fProb;                     // Probability of an event (if fRandom == kTRUE)
     TList  *fEntries;                   // List of Generators
     TObjLink *flnk1;                    // ! Iterator for first generator
     TArrayF  fProb;                     // Probability of an event (if fRandom == kTRUE)
     TList  *fEntries;                   // List of Generators
     TObjLink *flnk1;                    // ! Iterator for first generator