New reader for the pedestal run and vdrift (Julian) and some bug fixing (Raphaelle)

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

diff --git a/EVGEN/AliGenCocktailEntry.cxx b/EVGEN/AliGenCocktailEntry.cxx
index 741ee20ef8eedccd8a20178b2e20cd8b0a39e6d4..8d81bf57a32b894b12b604b05aa4b109ba87fc3e 100644 (file)
--- a/EVGEN/AliGenCocktailEntry.cxx
+++ b/EVGEN/AliGenCocktailEntry.cxx
@@ -28,36 +28,44 @@
 
 ClassImp(AliGenCocktailEntry)
 
-
-    AliGenCocktailEntry::AliGenCocktailEntry()
+AliGenCocktailEntry::AliGenCocktailEntry():
+    fGenerator(0),
+    fNGenerated(0),
+    fFirst(-1),
+    fLast(-1),
+    fRate(0),
+    fKineBias(1),
+    fBias(1)
 {
 // Default constructor
-    fGenerator =0;
-    fNGenerated=0;
-    fFirst=-1;
-    fLast=-1;
-    fRate=0;
-    fKineBias=1;
-    fBias=1;
+
 }
 
 AliGenCocktailEntry:: AliGenCocktailEntry
-(AliGenerator* Generator, char * Name, Float_t RateExp):TNamed(Name, "Generator Cocktail Entry")
+(AliGenerator* pGenerator, const char* Name, Float_t RateExp):TNamed(Name, "Generator Cocktail Entry"),
+    fGenerator(pGenerator),
+    fNGenerated(0),
+    fFirst(-1),
+    fLast(-1),
+    fRate(RateExp),
+    fKineBias(1),
+    fBias(1)
 {
-// Constructor using generator type, name and rate per event
-    fGenerator=Generator;
-    fNGenerated=0;
-    fFirst=-1;
-    fLast=-1;
-    fRate=RateExp;
-//         
-    fKineBias=1;
-    fBias=1;
+    // Constructor
 }
 
-AliGenCocktailEntry::AliGenCocktailEntry(const AliGenCocktailEntry &entry)
+AliGenCocktailEntry::AliGenCocktailEntry(const AliGenCocktailEntry &entry):
+    TNamed(entry),
+    fGenerator(0),
+    fNGenerated(0),
+    fFirst(-1),
+    fLast(-1),
+    fRate(0),
+    fKineBias(1),
+    fBias(1)
 {
 // Dummy copy constructor
+    entry.Copy(*this);
 }
 
 
@@ -72,5 +80,14 @@ AliGenCocktailEntry& AliGenCocktailEntry::operator
 =(const  AliGenCocktailEntry& rhs)
 {
 // Assignment operator
-    return *this;
+    rhs.Copy(*this);
+    return (*this);
+}
+
+void AliGenCocktailEntry::Copy(TObject&) const
+{
+    //
+    // Copy 
+    //
+    Fatal("Copy","Not implemented!\n");
 }