X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliAODInputHandler.h;h=4d4c3a1a6bc58377908443ce27db337b7bb5fc62;hb=8f7b1226e6156cef90cac09edaf8b085c8e6f503;hp=2f9d214e7dcb3874be9cca4ac4ea210d6230972e;hpb=fbb264e066a2c03eee05f374e324db96c8253377;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliAODInputHandler.h b/STEER/AliAODInputHandler.h
index 2f9d214e7dc..4d4c3a1a6bc 100644
--- a/STEER/AliAODInputHandler.h
+++ b/STEER/AliAODInputHandler.h
@@ -12,8 +12,10 @@
 
 #include "AliInputEventHandler.h"
 #include "AliAODEvent.h"
+#include "AliMCEvent.h"
 
 class TList;
+class AliMCEvent;
 
 class AliAODInputHandler : public AliInputEventHandler {
 
@@ -24,15 +26,29 @@ class AliAODInputHandler : public AliInputEventHandler {
     virtual Bool_t       Init(Option_t* /*opt*/) {return kTRUE;}
     virtual Bool_t       Init(TTree* tree, Option_t* opt);
     AliAODEvent         *GetEvent() const {return fEvent;}
+    AliMCEvent          *MCEvent()  const {return fMCEvent;}
     virtual void         AddFriend(char* filename);
     virtual Bool_t       BeginEvent(Long64_t entry);
+    Option_t            *GetDataType() const;
+    // Provisions for event merging
+    void                 SetMergeEvents(Bool_t flag) {fMergeEvents = flag;}
+    Bool_t               GetMergeEvents() const {return fMergeEvents;}
+    AliAODEvent*         GetEventToMerge() {return fAODEventToMerge;}
+    void                 SetMergeOffset(Int_t ioff) {fMergeOffset = ioff;}
  private:
     AliAODInputHandler(const AliAODInputHandler& handler);             
     AliAODInputHandler& operator=(const AliAODInputHandler& handler);  
  private:
     AliAODEvent    *fEvent;   //! Pointer to the event
+    AliMCEvent     *fMCEvent; //! Pointer to the MCEvent
     TList          *fFriends; //  List of friend trees 
-    ClassDef(AliAODInputHandler, 1);
+// Support for merged events
+    Bool_t          fMergeEvents;     // Flag for event merging
+    TFile          *fFileToMerge;     //! File for merging
+    TTree          *fTreeToMerge;     //! Tree for merging
+    AliAODEvent    *fAODEventToMerge; //! Event for merging
+    Int_t           fMergeOffset;     //! Event offset for merging
+    ClassDef(AliAODInputHandler, 2);
 };
 
 #endif