Make the logger compatible with AliMergeableCollection

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

diff --git a/EVGEN/AliGenCocktailEntry.cxx b/EVGEN/AliGenCocktailEntry.cxx
index 896fc85f2c5b4d7cb8e6345e692d203ed4d566af..ea80a09c732c2af52df68ec22feee9700ebded25 100644 (file)
--- a/EVGEN/AliGenCocktailEntry.cxx
+++ b/EVGEN/AliGenCocktailEntry.cxx
@@ -22,49 +22,62 @@
 // Author: andreas.morsch@cern.ch
 
 #include <TString.h>
+#include <TFormula.h>
 #include "AliGenCocktailEntry.h"
 #include "AliGenerator.h"
 
 
 ClassImp(AliGenCocktailEntry)
 
-
-
-AliGenCocktailEntry::AliGenCocktailEntry()
+AliGenCocktailEntry::AliGenCocktailEntry():
+    fGenerator(0),
+    fNGenerated(0),
+    fFirst(-1),
+    fLast(-1),
+    fRate(0),
+    fNTimes(1),
+    fKineBias(1),
+    fBias(1),
+    fFormula(0)
 {
 // 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),
+  fNTimes(1),
+  fKineBias(1),
+  fBias(1),
+  fFormula(0)
 {
-// 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):
-    TNamed(entry)
+    TNamed(entry),
+    fGenerator(0),
+    fNGenerated(0),
+    fFirst(-1),
+    fLast(-1),
+    fRate(0),
+    fNTimes(1),
+    fKineBias(1),
+    fBias(1),
+    fFormula(0)
 {
 // Dummy copy constructor
     entry.Copy(*this);
 }
 
 
-void AliGenCocktailEntry::PrintInfo()
+void AliGenCocktailEntry::PrintInfo() const
 {
 // Print out information about generator entry
     printf("\n Generator: %s Generated Events: %d First: %d Last: %d",