Unique names for functions enforced.

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

diff --git a/EVGEN/AliGenCocktail.cxx b/EVGEN/AliGenCocktail.cxx
index f8ef758655f948f493d85f23981968f024a33a1c..a039886c5a6f8c31100248ba25fac39d4ddb9a09 100644 (file)
--- a/EVGEN/AliGenCocktail.cxx
+++ b/EVGEN/AliGenCocktail.cxx
@@ -13,53 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.17  2003/03/24 15:58:27  morsch
-FinishRun() implemented.
-
-Revision 1.16  2003/01/14 10:50:18  alibrary
-Cleanup of STEER coding conventions
-
-Revision 1.15  2003/01/07 14:13:22  morsch
-Communication between generators provising and requesting collision
-geometries.
-
-Revision 1.14  2002/02/08 16:50:50  morsch
-Add name and title in constructor.
-
-Revision 1.13  2001/10/21 18:35:56  hristov
-Several pointers were set to zero in the default constructors to avoid memory management problems
-
-Revision 1.12  2001/06/18 13:07:30  morsch
-Forward kinematic ranges to entries only if not set by user.
-
-Revision 1.11  2001/01/30 09:23:12  hristov
-Streamers removed (R.Brun)
-
-Revision 1.10  2001/01/26 19:55:49  hristov
-Major upgrade of AliRoot code
-
-Revision 1.9  2000/12/21 16:24:06  morsch
-Coding convention clean-up
-
-Revision 1.8  2000/10/27 13:53:29  morsch
-AddGenerator: check testbit before setting the pT and momentum range
-(D.Y. Peressounko)
-
-Revision 1.7  2000/10/02 15:15:41  morsch
-Use default streamer for AliGenCocktail
-
-Revision 1.6  2000/09/07 17:04:31  morsch
-In Streamer: TIter() after R__b << fEntries (Dmitri Yurevitch Peressounko)
-
-Revision 1.5  2000/06/09 20:28:51  morsch
-All coding rule violations except RS3 corrected (AM)
-
-Revision 1.4  1999/09/29 09:24:12  fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
 
 // Container class for AliGenerator through recursion.
 // Container is itself an AliGenerator.
@@ -76,6 +30,7 @@ Introduction of the Copyright and cvs Log
 #include "AliGenCocktailEntry.h"
 #include "AliCollisionGeometry.h"
 #include "AliRun.h"
+#include "AliMC.h"
 
 ClassImp(AliGenCocktail)
 
@@ -85,15 +40,18 @@ 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)
+AliGenCocktail::AliGenCocktail(const AliGenCocktail & cocktail):
+    AliGenerator(cocktail)
 {
-// copy constructor
+// Copy constructor
+    cocktail.Copy(*this);
 }
 
 AliGenCocktail::~AliGenCocktail()
@@ -105,6 +63,11 @@ AliGenCocktail::~AliGenCocktail()
 void AliGenCocktail::
 AddGenerator(AliGenerator *Generator, 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))) 
@@ -120,15 +83,20 @@ AddGenerator(AliGenerator *Generator, char* Name, Float_t RateExp)
        Generator->SetThetaRange(fThetaMin*180/TMath::Pi(),fThetaMax*180/TMath::Pi());
     if (!(Generator->TestBit(kVertexRange))) 
        Generator->SetOrigin(fOrigin[0], fOrigin[1], fOrigin[2]);
-    Generator->
-       SetSigma(fOsigma[0], fOsigma[1], fOsigma[2]);
+
+    Generator->SetSigma(fOsigma[0], fOsigma[1], fOsigma[2]);
     Generator->SetVertexSmear(fVertexSmear);
-    Generator->SetTrackingFlag(fTrackIt);    
+    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++;
  }
@@ -166,8 +134,15 @@ 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
+//    
+    if(fVertexSmear == kPerEvent) Vertex();
+
+    
+  //
     // Loop over generators and generate events
     Int_t igen=0;
     
@@ -191,7 +166,7 @@ AddGenerator(AliGenerator *Generator, char* Name, Float_t RateExp)
                Fatal("Generate()", "No Collision Geometry Provided");
            }
        }
-       
+       entry->Generator()->SetVertex(fVertex.At(0), fVertex.At(1), fVertex.At(2));
        entry->Generator()->Generate();
        entry->SetLast(partArray->GetEntriesFast());
        preventry = entry;
@@ -256,7 +231,14 @@ NextGeneratorPair(AliGenCocktailEntry*& e1, AliGenCocktailEntry*& e2)
 AliGenCocktail& AliGenCocktail::operator=(const  AliGenCocktail& rhs)
 {
 // Assignment operator
-    return *this;
+    rhs.Copy(*this); 
+    return (*this);
 }
 
+void AliGenCocktail::Copy(TObject &) const
+{
+    Fatal("Copy","Not implemented!\n");
+}
+
+