Merge branch 'master' into flatdev

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

diff --git a/ANALYSIS/AliAnalysisTask.h b/ANALYSIS/AliAnalysisTask.h
index 7929f485e1a34d7acba9a1cbe0129801e4bf19fd..d7efbd75a1de856546550ebd5b53f8c853b0dfe1 100644 (file)
--- a/ANALYSIS/AliAnalysisTask.h
+++ b/ANALYSIS/AliAnalysisTask.h
@@ -34,6 +34,12 @@ class AliAnalysisTask : public TTask {
     kTaskPostEventLoop = BIT(17)
   };
 
+  //=====================================================================
+  // === OVERLOAD THIS TO CONNECT TREE BRANCHES AT INPUT SLOTS. YOU
+  // SHOULD DEFINE HERE ALSO THE OBJECTS TO BE CONNECTED TO YOUR OUTPUTS
+  virtual void              ConnectInputData(Option_t *option="");
+  //=====================================================================
+  
  protected:
   Bool_t                    fReady;         // Flag if the task is ready
   Bool_t                    fInitialized;   // True if Init() was called
@@ -43,18 +49,12 @@ class AliAnalysisTask : public TTask {
   TObject                  *fPublishedData; //! published data
   TObjArray                *fInputs;        // Array of input slots
   TObjArray                *fOutputs;       // Array of output slots
+  TString                   fBranchNames;   // List of input branches that need to be loaded for this task
 
   // Define the input/output slots (called by user in the ctor of the derived class)
   //=== CALL IN THE CONSTRUCTOR OF DERIVED CLASS TO DEFINE INPUTS/OUTPUTS ===
   void                      DefineInput(Int_t islot, TClass *type);
   void                      DefineOutput(Int_t islot, TClass *type);
-  //=====================================================================
-  
-  //=====================================================================
-  // === OVERLOAD THIS TO CONNECT TREE BRANCHES AT INPUT SLOTS. YOU
-  // SHOULD DEFINE HERE ALSO THE OBJECTS TO BE CONNECTED TO YOUR OUTPUTS
-  virtual void              ConnectInputData(Option_t *option="");
-  //=====================================================================
   
   // Post output data (called by Exec() when data is ready)
   //=== CALL IN EXEC() FOR EACH OUTPUT WHEN READY ===
@@ -87,8 +87,15 @@ public:
   virtual void              CreateOutputObjects();
   // === OVERLOAD THIS IF YOU NEED TO INITIALIZE YOUR CLASS ON THE CLIENT
   virtual void              LocalInit();
-  // === OVERLOAD THIS IF YOU NEED TO TREAT INPUT FILE CHANGE
+  // === OVERLOAD THIS IF YOU NEED TO TREAT INPUT FILE/TREE CHANGE
   virtual Bool_t            Notify();
+  // === OVERLOAD THIS IF YOU NEED TO TREAT BIN CHANGE IN EVENT MIXING
+  virtual Bool_t            NotifyBinChange();
+  //=====================================================================
+  // Optional method that will be called in SlaveTerminate phase for each task
+  // Warning: in PROOF mode this is called before merging so their cleanup is
+  //          not allowed - do output cleanup in class destructor.
+  virtual void              FinishTaskOutput();
   // Conect inputs/outputs to data containers (by AliAnalysisModule)
   Bool_t                    ConnectInput(Int_t islot, AliAnalysisDataContainer *cont);
   Bool_t                    ConnectOutput(Int_t islot, AliAnalysisDataContainer *cont);
@@ -98,7 +105,12 @@ public:
   void                      CheckNotify(Bool_t init=kFALSE);
   // Check if there are illegal circular dependencies
   Bool_t                    CheckCircularDeps();
+  virtual Bool_t            CheckPostData() const;
+  virtual Bool_t            CheckOwnership() const;
+  // Reset task
+  virtual void              Reset();
   // Getters
+  void                      GetBranches(const char *type, TString &result) const;
   Int_t                     GetNinputs() const  {return fNinputs;}
   Int_t                     GetNoutputs() const {return fNoutputs;}
   TObject                  *GetPublishedData() const {return fPublishedData;}
@@ -116,8 +128,11 @@ public:
   Bool_t                    IsReady() const  {return fReady;}
   Bool_t                    IsUsed() const   {return TObject::TestBit(kTaskUsed);}
   Bool_t                    IsZombie() const {return TObject::TestBit(kTaskZombie);}
-  void                      PrintTask(Option_t *option="all", Int_t indent=0) const;
+  Bool_t                    HasBranches() const {return !fBranchNames.IsNull();}
+  virtual void                      PrintTask(Option_t *option="all", Int_t indent=0) const;
   void                      PrintContainers(Option_t *option="all", Int_t indent=0) const;
+  Bool_t                    ProducersTouched() const;
+  void                      SetBranches(const char *names) {fBranchNames = names;}
   void                      SetChecked(Bool_t flag=kTRUE) {TObject::SetBit(kTaskChecked,flag);}
   void                      SetPostEventLoop(Bool_t flag=kTRUE);
   void                      SetUsed(Bool_t flag=kTRUE);
@@ -132,6 +147,6 @@ public:
   virtual void              Terminate(Option_t *option="");
   //=====================================================================
     
-  ClassDef(AliAnalysisTask,1)  // Class describing an analysis task
+  ClassDef(AliAnalysisTask,2)  // Class describing an analysis task
 };
 #endif