Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / EVGEN / AliGenCocktailAfterBurner.h

diff --git a/EVGEN/AliGenCocktailAfterBurner.h b/EVGEN/AliGenCocktailAfterBurner.h
index c9868516fa569b9c23222bc5bbf19e20fc6d66a7..0930e19167839aa868598ae6134ebab634101fee 100644 (file)
--- a/EVGEN/AliGenCocktailAfterBurner.h
+++ b/EVGEN/AliGenCocktailAfterBurner.h
@@ -13,14 +13,13 @@
 #include <TMCProcess.h>
 
 #include "AliGenCocktail.h"
-#include "AliRun.h"
+#include "AliRunLoader.h"
 
 class AliGenCocktailEntry;
 class AliStack;
-
-// ANDREAS MORSCH ------------------------------------- (
 class AliCollisionGeometry;
-// ANDREAS MORSCH ------------------------------------- )
+class AliGenCocktailEventHeader;
+
 
 class AliGenCocktailAfterBurner : public  AliGenCocktail
 {
@@ -30,9 +29,7 @@ class AliGenCocktailAfterBurner : public  AliGenCocktail
 
  public:
     AliGenCocktailAfterBurner();
-    AliGenCocktailAfterBurner(const AliGenCocktailAfterBurner& in);
     virtual ~AliGenCocktailAfterBurner();
-    AliGenCocktailAfterBurner & operator=(const AliGenCocktailAfterBurner & rhs);
     
     virtual void  Init();
     virtual void  Generate();
@@ -45,15 +42,14 @@ class AliGenCocktailAfterBurner : public  AliGenCocktail
     AliStack*     GetStack(Int_t n) const;
     AliStack*     GetActiveStack() const{return fActiveStack;}
 
-// ANDREAS MORSCH ------------------------------------- (
     AliCollisionGeometry* GetCollisionGeometry(Int_t n) const;
-// ANDREAS MORSCH ------------------------------------- )
  
     AliGenerator* GetCurrentGenerator() const;
     virtual void  SetActiveEventNumber(Int_t actev);
     Int_t         GetActiveEventNumber() const {return fActiveEvent;}
-    virtual Int_t GetNumberOfEvents() const {return gAlice->GetEventsPerRun() + fNBgEvents;}
+    virtual Int_t GetNumberOfEvents() const {return AliRunLoader::Instance()->GetNumberOfEventsPerRun() + fNBgEvents;}
     void          SetNBgEvents(Int_t nbg=0){fNBgEvents = nbg;}
+    AliGenCocktailEventHeader* GetActiveEventHeader() const { return fHeaders[fActiveEvent]; }
 
     static TMCProcess IntToMCProcess(Int_t no);
 
@@ -66,9 +62,8 @@ class AliGenCocktailAfterBurner : public  AliGenCocktail
                                 //   
     TObjArray *fInternalStacks; //! List of internal stacks
 
-// ANDREAS MORSCH ------------------------------------- (
-    AliCollisionGeometry** fCollisionGeometries; //! List of Collision Geometries
-// ANDREAS MORSCH ------------------------------------- )
+    AliCollisionGeometry**      fCollisionGeometries; //! List of Collision Geometries
+    AliGenCocktailEventHeader** fHeaders;             //! List of Headers
     
     Int_t fCurrentEvent;        //  Number of current event/stack
     
@@ -85,7 +80,8 @@ class AliGenCocktailAfterBurner : public  AliGenCocktail
                                           //needed by some afterburners that works better with higher statistics 
                                           //this generates such a artificial one
  private:
-    void Copy(TObject &arun) const;    
+    AliGenCocktailAfterBurner(const AliGenCocktailAfterBurner& in);
+    AliGenCocktailAfterBurner & operator=(const AliGenCocktailAfterBurner & rhs);
 
     ClassDef(AliGenCocktailAfterBurner,2) // Particle cocktail generator a la SHAKER
                                           //background events added