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

[u/mrichter/AliRoot.git] / STEER / STEERBase / AliMCEvent.h

diff --git a/STEER/STEERBase/AliMCEvent.h b/STEER/STEERBase/AliMCEvent.h
index 26ca291d0e11c0f0d6d04f21eba70c4ab234a047..1bff083236cafce8955a5b6ba5e9f11b83a1619f 100644 (file)
--- a/STEER/STEERBase/AliMCEvent.h
+++ b/STEER/STEERBase/AliMCEvent.h
@@ -18,7 +18,7 @@
 #include <TRefArray.h>
 #include <TClonesArray.h>
 
-#include <AliVEvent.h>
+#include "AliVEvent.h"
 #include "AliVHeader.h"
 #include "AliVParticle.h"
 #include "AliVVertex.h"
@@ -86,6 +86,7 @@ public:
 
     virtual ULong64_t GetTriggerMask()        const {return 0;}
     virtual UChar_t   GetTriggerCluster()     const {return 0;}
+    virtual TString   GetFiredTriggerClasses()const {return ("");}
     virtual Double_t  GetZDCN1Energy()        const {return 0.;}
     virtual Double_t  GetZDCP1Energy()        const {return 0.;}
     virtual Double_t  GetZDCN2Energy()        const {return 0.;}
@@ -110,6 +111,7 @@ public:
     // Services
     virtual void      ConnectTreeE (TTree* tree);
     virtual void      ConnectTreeK (TTree* tree);
+    virtual void      ConnectHeaderAndStack(AliHeader* header);
     virtual void      ConnectTreeTR(TTree* tree);
     virtual void      Clean();
     virtual void      InitEvent();
@@ -133,6 +135,7 @@ public:
     virtual void      SetParticleArray(TClonesArray* mcParticles) 
        {fMCParticles = mcParticles; fNparticles = fMCParticles->GetEntries(); fExternal = kTRUE;}
     
+  virtual AliGenEventHeader *FindHeader(Int_t ipart);
     //Following needed only for mixed event
   virtual Int_t        EventIndex(Int_t)       const {return 0;}
   virtual Int_t        EventIndexForCaloCluster(Int_t) const {return 0;}
@@ -144,14 +147,11 @@ public:
   virtual AliVVZERO    *GetVZEROData() const {return 0;}
   virtual AliVZDC      *GetZDCData()   const {return 0;}
     
-//   #ifdef MFT_UPGRADE
-//   virtual AliVMFT *GetMFTData() const {return 0;}
-//   #endif
-  virtual AliVMFT *GetMFTData() const {return 0;}    // AU
-       
+
 private:
     virtual void      ReorderAndExpandTreeTR();
     virtual Int_t     FindIndexAndEvent(Int_t oldidx, AliMCEvent*& event) const;
+    void             UpdateEventInformation();
     
 private: 
     // Stanndard implementation for ESD production