A pointer was set to zero in the default constructor to avoid memory management problems

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

diff --git a/EVGEN/AliGenCocktailEntry.cxx b/EVGEN/AliGenCocktailEntry.cxx
index fde8910159b8d688a239354e8b4f7859b1461983..fd730fdf47864dec173d0c0ac890b37c2e3d3a3e 100644 (file)
--- a/EVGEN/AliGenCocktailEntry.cxx
+++ b/EVGEN/AliGenCocktailEntry.cxx
@@ -17,14 +17,21 @@
 $Log $
 */
 
+// Entry for AliGenCocktail container class. 
+// See also comments there.
+// In addition to the pointer to the generator the class provides some 
+// bookkeeping functionality (weights, links to particle list, ...)
+// Author: andreas.morsch@cern.ch
+
+#include <TString.h>
 #include "AliGenCocktailEntry.h"
-#include "AliRun.h"
-#include <stdlib.h>
+#include "AliGenerator.h"
+
 
 ClassImp(AliGenCocktailEntry)
 
 
-AliGenCocktailEntry::AliGenCocktailEntry()
+    AliGenCocktailEntry::AliGenCocktailEntry()
 {
 // Default constructor
     fGenerator =0;
@@ -34,11 +41,10 @@ AliGenCocktailEntry::AliGenCocktailEntry()
     fRate=0;
     fKineBias=1;
     fBias=1;
-    fName="unknown";
 }
 
 AliGenCocktailEntry:: AliGenCocktailEntry
-(AliGenerator* Generator, TString Name, Float_t RateExp)
+(AliGenerator* Generator, char * Name, Float_t RateExp):TNamed(Name, "Generator Cocktail Entry")
 {
 // Constructor using generator type, name and rate per event
     fGenerator=Generator;
@@ -46,17 +52,22 @@ AliGenCocktailEntry:: AliGenCocktailEntry
     fFirst=-1;
     fLast=-1;
     fRate=RateExp;
-    fName=Name;
 //         
     fKineBias=1;
     fBias=1;
 }
 
+AliGenCocktailEntry::AliGenCocktailEntry(const AliGenCocktailEntry &entry)
+{
+// Dummy copy constructor
+}
+
+
 void AliGenCocktailEntry::PrintInfo()
 {
 // Print out information about generator entry
-printf("\n Generator: %s Generated Events: %d First: %d Last: %d",
-       (const char *) fName, fGenerator->NumberParticles(), fFirst, fLast);
+    printf("\n Generator: %s Generated Events: %d First: %d Last: %d",
+          (const char *) fName, fGenerator->NumberParticles(), fFirst, fLast);
 }
  
 AliGenCocktailEntry& AliGenCocktailEntry::operator