Overlaps corrected, new shape of sectors

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

diff --git a/EVGEN/AliGenCocktailAfterBurner.h b/EVGEN/AliGenCocktailAfterBurner.h
index 777bf52e7b5555a0232f9943216b86a08bf6a3a9..c6920406df3a7ad08231eb969c6284c3d5d716fa 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
 {
@@ -38,20 +37,19 @@ class AliGenCocktailAfterBurner : public  AliGenCocktail
     //
     // Add a new generator to the list
     virtual void  AddAfterBurner
-       (AliGenerator *Generator, char* Name, Float_t RateExp );
+       (AliGenerator *Generator, const char* Name, Float_t RateExp );
     
     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 AliRunLoader::Instance()->GetNumberOfEvents() + 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);
 
@@ -64,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