- Set of changes needed for merging aod files in CAF. Some fixes also for event mixing.

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

diff --git a/STEER/AliAODHandler.h b/STEER/AliAODHandler.h
index 73cc666a03b5f60d00eacece14bff8c012e88115..807286a9f2cc71818f55a81315d3796d3b02f7bb 100644 (file)
--- a/STEER/AliAODHandler.h
+++ b/STEER/AliAODHandler.h
@@ -24,31 +24,38 @@ class AliAODHandler : public AliVEventHandler {
     AliAODHandler();
     AliAODHandler(const char* name, const char* title);
     virtual ~AliAODHandler();
-    virtual void         SetOutputFileName(char* fname) {fName = fname;}
-    virtual char*        GetOutputFileName() {return fName;}
-    virtual Bool_t       InitIO(Option_t* option);
-    virtual Bool_t       BeginEvent(){ return kTRUE;}
+    virtual void         SetOutputFileName(const char* fname);
+    virtual const char*  GetOutputFileName();
+    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 void         SetCreateNonStandardAOD() {fIsStandard = kFALSE;}
+    //
     AliAODEvent*         GetAOD()  {return fAODEvent;}
-    TTree*               GetTree() {return fTreeA;}
-    void                 CreateTree();
+    virtual TTree*       GetTree() {return fTreeA;}
+    void                 CreateTree(Int_t flag);
     void                 FillTree();
     void                 AddAODtoTreeUserInfo();
+    void                 AddBranch(const char* cname, void* 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
-    ClassDef(AliAODHandler, 1);
+    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
+    TString                  fFileName;   //  Output file name
+    ClassDef(AliAODHandler, 2);
 };
 
 #endif