Derive from TNamed.

diff --git a/EVGEN/AliGenCocktailEntry.cxx b/EVGEN/AliGenCocktailEntry.cxx
index cc4ec2cd18c9fd525f4efa72aaf9be3fd0397ed4..40a221f3cb09efe1d0075b63174001963e61dbea 100644 (file)
--- a/EVGEN/AliGenCocktailEntry.cxx
+++ b/EVGEN/AliGenCocktailEntry.cxx
@@ -18,13 +18,13 @@ $Log $
 */
 
 #include "AliGenCocktailEntry.h"
-#include "AliRun.h"
-#include <stdlib.h>
+#include "AliGenerator.h"
+
 
 ClassImp(AliGenCocktailEntry)
 
 
-AliGenCocktailEntry::AliGenCocktailEntry()
+    AliGenCocktailEntry::AliGenCocktailEntry()
 {
 // Default constructor
     fGenerator =0;
@@ -34,11 +34,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,7 +45,6 @@ AliGenCocktailEntry:: AliGenCocktailEntry
     fFirst=-1;
     fLast=-1;
     fRate=RateExp;
-    fName=Name;
 //         
     fKineBias=1;
     fBias=1;
@@ -61,8 +59,8 @@ AliGenCocktailEntry::AliGenCocktailEntry(const AliGenCocktailEntry &entry)
 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

diff --git a/EVGEN/AliGenCocktailEntry.h b/EVGEN/AliGenCocktailEntry.h
index daed7d6275606d2d13ed216d87d8ec3623ef7d45..bb2e5891be53ed921719c71fd2e387fa611b1291 100644 (file)
--- a/EVGEN/AliGenCocktailEntry.h
+++ b/EVGEN/AliGenCocktailEntry.h
@@ -6,19 +6,19 @@
 /* $Id$ */
 
 
-#include <TObject.h>
+#include <TNamed.h>
 #include <TString.h>
 
 class AliGenerator;
 
 
-class AliGenCocktailEntry : public TObject
+class AliGenCocktailEntry : public TNamed
 {
  public:
     AliGenCocktailEntry();
     AliGenCocktailEntry(const AliGenCocktailEntry &entry);
     AliGenCocktailEntry
-       (AliGenerator* Generator, TString Name, Float_t RateExp);
+       (AliGenerator* Generator, char* Name, Float_t RateExp);
     ~AliGenCocktailEntry(){;}
     AliGenerator* Generator() {return fGenerator;}
     void SetGenerator(AliGenerator* generator){fGenerator=generator;}
@@ -37,7 +37,6 @@ class AliGenCocktailEntry : public TObject
     Float_t fRate;              // Rate per event
     Float_t fKineBias;          // Bias due to kinematic selecion
     Float_t fBias;              // Bias
-    TString fName;              // Name of generator
  private:
     ClassDef(AliGenCocktailEntry,1) // Generator entry of AliGenCocktail
 };