Solved merge problem of last checkin.

[u/mrichter/AliRoot.git] / STEER / AliHeader.h

diff --git a/STEER/AliHeader.h b/STEER/AliHeader.h
index 67a04cf7b2e7a27c8d753ad04c23ba3fdae049be..946a59e433334f3b6bb9b50c0d4936aa48903b24 100644 (file)
--- a/STEER/AliHeader.h
+++ b/STEER/AliHeader.h
@@ -1,32 +1,30 @@
-#ifndef AliHeader_H
-#define AliHeader_H
+#ifndef ALIHEADER_H
+#define ALIHEADER_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
 /* $Id$ */
 
-#include "TObject.h"
+#include <TObject.h>
+class AliStack;
+class AliGenEventHeader;
  
 class AliHeader : public TObject {
-protected:
-  Int_t         fRun;         //Run number
-  Int_t         fNvertex;     //Number of vertices
-  Int_t         fNprimary;    //Number of primary tracks
-  Int_t         fNtrack;      //Number of tracks
-  Int_t         fEvent;       //Event number
-
 public:
   AliHeader();
   AliHeader(Int_t run, Int_t event);
-  ~AliHeader() {;}
+  AliHeader(Int_t run, Int_t eventSerialNr, Int_t evNrInRun);
+  virtual ~AliHeader() {}
 
   virtual void Reset(Int_t run, Int_t event);
+  virtual void Reset(Int_t run, Int_t eventSerialNr, Int_t evNrInRun);
 
   virtual  void  SetRun(Int_t run) {fRun = run;}
   virtual  Int_t GetRun() const {return fRun;}
   
   virtual  void  SetNprimary(Int_t nprimary) {fNprimary = nprimary;}
-  virtual  Int_t GetNprimary() const {return fNprimary;}
+  virtual  Int_t GetNprimary()   const {return fNprimary;}
+  virtual  Int_t GetNsecondary() const {return fNtrack-fNprimary;}
   
   virtual  void  SetNvertex(Int_t vertex) {fNvertex = vertex;}
   virtual  Int_t GetNvertex() const {return fNvertex;}
@@ -37,10 +35,28 @@ public:
   virtual  void  SetEvent(Int_t event) {fEvent = event;}
   virtual  Int_t GetEvent() const {return fEvent;}
 
-  virtual void Dump();
+  virtual  void  SetEventNrInRun(Int_t event) {fEventNrInRun = event;}
+  virtual  Int_t GetEventNrInRun() const {return fEventNrInRun;}
+
+  virtual  AliStack* Stack() const;
+  virtual  void SetStack(AliStack* stack);
+
+  virtual  void SetGenEventHeader(AliGenEventHeader* header);
+  virtual  AliGenEventHeader*  GenEventHeader() const;
+
+  virtual void Print(const char *opt=0);
+  
+protected:
+  Int_t         fRun;         //Run number
+  Int_t         fNvertex;     //Number of vertices
+  Int_t         fNprimary;    //Number of primary tracks
+  Int_t         fNtrack;      //Number of tracks
+  Int_t         fEvent;       //Event number (serial in the file)
+  Int_t         fEventNrInRun; //Unique Event number within the run
+  AliStack     *fStack;       //Pointer to stack
+  AliGenEventHeader* fGenHeader;    //Event Header for Generator  
   
-  ClassDef(AliHeader,1) //Alice event header
-    
+  ClassDef(AliHeader,2) //Alice event header    
 };
 
 #endif