Added Protection and Error Message for missing Output Tree

[u/mrichter/AliRoot.git] / ANALYSIS / AliAnalysisDataContainer.h

diff --git a/ANALYSIS/AliAnalysisDataContainer.h b/ANALYSIS/AliAnalysisDataContainer.h
index 997b82d8ba01c3ae928c20590dfa4db252f5155e..7297a3ae5eb5aa90de2f4e30a0ace63dc34a141b 100644 (file)
--- a/ANALYSIS/AliAnalysisDataContainer.h
+++ b/ANALYSIS/AliAnalysisDataContainer.h
@@ -40,7 +40,8 @@ enum ENotifyMessage {
 };   
 enum EAnalysisContainerFlags {
    kPostEventLoop = BIT(14),
-   kSpecialOutput = BIT(15)
+   kSpecialOutput = BIT(15),
+   kRegisterDataset = BIT(16)
 };     
    AliAnalysisDataContainer();
    AliAnalysisDataContainer(const AliAnalysisDataContainer &cont);
@@ -52,6 +53,7 @@ enum EAnalysisContainerFlags {
    // Getters
    TObject                  *GetData() const      {return fData;}
    const char               *GetFileName() const  {return fFileName.Data();}
+   const char               *GetFolderName() const {return fFolderName.Data();}
    TFile                    *GetFile() const      {return fFile;}
    TClass                   *GetType() const;
    AliAnalysisTask          *GetProducer() const  {return fProducer;}
@@ -63,7 +65,8 @@ enum EAnalysisContainerFlags {
    void                      SetDataOwned(Bool_t flag) {fOwnedData = flag;}
    void                      SetPostEventLoop(Bool_t flag=kTRUE) {TObject::SetBit(kPostEventLoop,flag);}
    void                      SetSpecialOutput(Bool_t flag=kTRUE) {TObject::SetBit(kSpecialOutput,flag);}
-   void                      SetFileName(const char *filename) {fFileName = filename;}
+   void                      SetRegisterDataset(Bool_t flag=kTRUE) {TObject::SetBit(kRegisterDataset,flag);}
+   void                      SetFileName(const char *filename);
    void                      SetFile(TFile *f) {fFile = f;}
    void                      SetProducer(AliAnalysisTask *prod, Int_t islot);
    void                      AddConsumer(AliAnalysisTask *cons, Int_t islot);
@@ -75,6 +78,7 @@ enum EAnalysisContainerFlags {
    Bool_t                    IsDataReady() const  {return fDataReady;}
    Bool_t                    IsPostEventLoop() const {return TObject::TestBit(kPostEventLoop);}
    Bool_t                    IsSpecialOutput() const {return TObject::TestBit(kSpecialOutput);}
+   Bool_t                    IsRegisterDataset() const {return TObject::TestBit(kRegisterDataset);}
    Bool_t                    IsOwnedData() const  {return fOwnedData;}
    Bool_t                    ClientsExecuted() const;
    Bool_t                    HasConsumers() const {return (fConsumers != 0);}
@@ -93,13 +97,14 @@ protected:
    Bool_t                    fDataReady;  // Flag that data is ready
    Bool_t                    fOwnedData;  // Flag data ownership
    TString                   fFileName;   // File storing the data
+   TString                   fFolderName; // Folder name in the output file
    TFile                    *fFile;       //! Opened file
    TObject                  *fData;       // Contained data
    TClass                   *fType;       //! Type of contained data
    AliAnalysisTask          *fProducer;   // Analysis task to which the slot belongs
    TObjArray                *fConsumers;  // List of consumers of the data
    
-   ClassDef(AliAnalysisDataContainer,1)  // Class describing a data container for analysis
+   ClassDef(AliAnalysisDataContainer,2)  // Class describing a data container for analysis
 };
 
 //==============================================================================