X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliAODHandler.h;h=6b4a38f737c4c623b4bb099cc1ddc48d58684076;hb=deeb9f12e27920393ae3b0da62cebf5f8e4cd983;hp=fbdd54412dacee072e789342c2d7044e9fe353a9;hpb=e910dd36827e91c2e36eb52c3d0e7b3c8a5c64a1;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliAODHandler.h b/STEER/AliAODHandler.h
index fbdd54412da..6b4a38f737c 100644
--- a/STEER/AliAODHandler.h
+++ b/STEER/AliAODHandler.h
@@ -10,7 +10,7 @@
 //     Author: Andreas Morsch, CERN
 //-------------------------------------------------------------------------
 
-#include "AliVirtualEventHandler.h"
+#include "AliVEventHandler.h"
 
 class AliAODEvent;
 class TFile;
@@ -18,7 +18,7 @@ class TTree;
 
 
 
-class AliAODHandler : public AliVirtualEventHandler {
+class AliAODHandler : public AliVEventHandler {
     
  public:
     AliAODHandler();
@@ -26,25 +26,35 @@ class AliAODHandler : public AliVirtualEventHandler {
     virtual ~AliAODHandler();
     virtual void         SetOutputFileName(char* fname) {fName = fname;}
     virtual char*        GetOutputFileName() {return fName;}
-    virtual Bool_t       InitIO(Option_t* option);
-    virtual Bool_t       Fill();
+    virtual Bool_t       Init(Option_t* option);
+    virtual Bool_t       Init(TTree* /*tree*/, Option_t* /*option*/)  {return kTRUE;}
+    virtual Bool_t       BeginEvent(Long64_t /*entry*/)  {return kTRUE;}
+    virtual Bool_t       Notify() { return AliVEventHandler::Notify(); };
+    virtual Bool_t       Notify(const char * /* path */) {return kTRUE;}
+    virtual Bool_t       FinishEvent();
     virtual Bool_t       Terminate();
     virtual Bool_t       TerminateIO();
-    virtual Bool_t       Notify() {return kTRUE;}
+    //
+    virtual void         SetCreateNonStandardAOD() {fIsStandard = kFALSE;}
     //
     AliAODEvent*         GetAOD()  {return fAODEvent;}
     TTree*               GetTree() {return fTreeA;}
-    void                 CreateTree();
+    void                 CreateTree(Int_t flag);
     void                 FillTree();
     void                 AddAODtoTreeUserInfo();
+    void                 AddBranch(const char* cname, TObject* addobj);
+    Bool_t               IsStandard() {return fIsStandard;}
+    //
+    void                 SetInputTree(TTree* /*tree*/) {;}
  private:
     AliAODHandler(const AliAODHandler&);             // Not implemented
     AliAODHandler& operator=(const AliAODHandler&);  // Not implemented
  private:
-    AliAODEvent             *fAODEvent;  //! Pointer to the AOD event
-    TTree                   *fTreeA;     //! tree for AOD persistency
-    TFile                   *fFileA;     //! Output file
-    char                    *fName;      //! Output file name
+    Bool_t                   fIsStandard; //! Flag for standard aod creation 
+    AliAODEvent             *fAODEvent;   //! Pointer to the AOD event
+    TTree                   *fTreeA;      //! tree for AOD persistency
+    TFile                   *fFileA;      //! Output file
+    char                    *fName;       //! Output file name
     ClassDef(AliAODHandler, 1);
 };