style modifications (Markus)

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

diff --git a/EVGEN/AliGenCocktailEntry.cxx b/EVGEN/AliGenCocktailEntry.cxx
index cc4ec2cd18c9fd525f4efa72aaf9be3fd0397ed4..8d81bf57a32b894b12b604b05aa4b109ba87fc3e 100644 (file)
--- a/EVGEN/AliGenCocktailEntry.cxx
+++ b/EVGEN/AliGenCocktailEntry.cxx
@@ -13,61 +13,81 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log $
-*/
+/* $Id$ */
 
+// 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)
 
+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;
-    fName="unknown";
+
 }
 
 AliGenCocktailEntry:: AliGenCocktailEntry
-(AliGenerator* Generator, TString Name, Float_t RateExp)
+(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;
-    fName=Name;
-//         
-    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);
 }
 
 
 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
 =(const  AliGenCocktailEntry& rhs)
 {
 // Assignment operator
-    return *this;
+    rhs.Copy(*this);
+    return (*this);
+}
+
+void AliGenCocktailEntry::Copy(TObject&) const
+{
+    //
+    // Copy 
+    //
+    Fatal("Copy","Not implemented!\n");
 }