Use default streamer for AliGenCocktail

diff --git a/EVGEN/AliGenCocktail.cxx b/EVGEN/AliGenCocktail.cxx
index bca5168cfc406fe863d93dad654f8490a9d7fe3d..03e3cfaf9a75c6000b0aaf29d274f5d5c6a5f1d7 100644 (file)
--- a/EVGEN/AliGenCocktail.cxx
+++ b/EVGEN/AliGenCocktail.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.6  2000/09/07 17:04:31  morsch
+In Streamer: TIter() after R__b << fEntries (Dmitri Yurevitch Peressounko)
+
 Revision 1.5  2000/06/09 20:28:51  morsch
 All coding rule violations except RS3 corrected (AM)
 
@@ -26,7 +29,6 @@ Introduction of the Copyright and cvs Log
 #include "AliGenCocktail.h"
 #include "AliGenCocktailEntry.h"
 #include "AliRun.h"
-#include <stdlib.h>
 
 ClassImp(AliGenCocktail)
 
@@ -50,7 +52,7 @@ AliGenCocktail::~AliGenCocktail()
 }
 
 void AliGenCocktail::
-AddGenerator(AliGenerator *Generator, TString Name, Float_t RateExp)
+AddGenerator(AliGenerator *Generator, char* Name, Float_t RateExp)
 {
 //
 //  Forward parameters to the new generator
@@ -69,6 +71,7 @@ AddGenerator(AliGenerator *Generator, TString Name, Float_t RateExp)
     Generator->SetTrackingFlag(fTrackIt);    
 //
 //  Add generator to list   
+    
     AliGenCocktailEntry *entry = 
        new AliGenCocktailEntry(Generator, Name, RateExp);
      fEntries->Add(entry);
@@ -183,7 +186,7 @@ NextGeneratorPair(AliGenCocktailEntry*& e1, AliGenCocktailEntry*& e2)
     }
 }
 
-
+/*
 void AliGenCocktail::Streamer(TBuffer &R__b)
 {
     // Stream an object of class AliGenCocktail.
@@ -212,6 +215,7 @@ void AliGenCocktail::Streamer(TBuffer &R__b)
        }  
     }
 }
+*/
 
 AliGenCocktail& AliGenCocktail::operator=(const  AliGenCocktail& rhs)
 {

diff --git a/EVGEN/AliGenCocktail.h b/EVGEN/AliGenCocktail.h
index 277fa65cd3e5d5115e0b18a23932ac3c5142b72c..2f322e631fbf83f07e50ab549c0a0526da790eae 100644 (file)
--- a/EVGEN/AliGenCocktail.h
+++ b/EVGEN/AliGenCocktail.h
@@ -6,6 +6,7 @@
 /* $Id$ */
 
 #include "AliGenerator.h"
+#include <TList.h>
 
 class AliGenCocktailEntry;
 
@@ -22,7 +23,7 @@ class AliGenCocktail : public AliGenerator
     //
     // Add a new generator to the list
     virtual void AddGenerator
-       (AliGenerator *Generator, TString Name, Float_t RateExp );
+       (AliGenerator *Generator, char* Name, Float_t RateExp );
     virtual TList* Entries() {return fEntries;}
     // Iterators
     AliGenCocktailEntry*  FirstGenerator();
@@ -34,8 +35,8 @@ class AliGenCocktail : public AliGenerator
  protected:
     Int_t fNGenerators;   // Number of generators booked
     TList  *fEntries;     // List of Generators
-    TObjLink *flnk1;      // Iterator for first generator
-    TObjLink *flnk2;      // Iterator for second generator
+    TObjLink *flnk1;      // ! Iterator for first generator
+    TObjLink *flnk2;      // ! Iterator for second generator
 //
     ClassDef(AliGenCocktail,1) // Particle cocktail generator a la SHAKER
 };

diff --git a/EVGEN/EVGENLinkDef.h b/EVGEN/EVGENLinkDef.h
index f1e3a2f64b193aedee534627547a61085cf6b481..1189e427620498e038dad8a9b04f8b9a1dcbf2d1 100644 (file)
--- a/EVGEN/EVGENLinkDef.h
+++ b/EVGEN/EVGENLinkDef.h
@@ -19,9 +19,10 @@
 #pragma link C++ class  AliGenBox;
 #pragma link C++ class  AliGenParam;
 #pragma link C++ class  AliGenPythia-;
-#pragma link C++ class  AliGenCocktail-;
+#pragma link C++ class  AliGenCocktail;
 #pragma link C++ class  AliGenCocktailEntry;
 #pragma link C++ class  AliGenExtFile;
+#pragma link C++ class  AliGenExtFileCH;
 #pragma link C++ class  AliGenScan;
 #pragma link C++ class  AliGenDoubleScan;
 #pragma link C++ class  AliPythia-;