Fixes in the command to submit merging

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

diff --git a/ANALYSIS/AliAnalysisTask.cxx b/ANALYSIS/AliAnalysisTask.cxx
index 2ea368db23ade12bed603478af38bd1048e711d2..47edc46945ae2d97e1e153579054e85c3d1a5e3d 100644 (file)
--- a/ANALYSIS/AliAnalysisTask.cxx
+++ b/ANALYSIS/AliAnalysisTask.cxx
@@ -101,6 +101,7 @@
 #include <TFile.h>
 #include <TClass.h>
 #include <TTree.h>
+#include <TROOT.h>
 
 #include "AliAnalysisTask.h"
 #include "AliAnalysisDataSlot.h"
@@ -118,7 +119,8 @@ AliAnalysisTask::AliAnalysisTask()
                  fOutputReady(NULL),
                  fPublishedData(NULL),
                  fInputs(NULL),
-                 fOutputs(NULL)
+                 fOutputs(NULL),
+                 fBranchNames()
 {
 // Default constructor.
 }
@@ -133,7 +135,8 @@ AliAnalysisTask::AliAnalysisTask(const char *name, const char *title)
                  fOutputReady(NULL),
                  fPublishedData(NULL),
                  fInputs(NULL),
-                 fOutputs(NULL)                 
+                 fOutputs(NULL),
+                 fBranchNames()                 
 {
 // Constructor.
    fInputs      = new TObjArray(2);
@@ -150,7 +153,8 @@ AliAnalysisTask::AliAnalysisTask(const AliAnalysisTask &task)
                  fOutputReady(NULL),
                  fPublishedData(NULL),
                  fInputs(NULL),
-                 fOutputs(NULL)                 
+                 fOutputs(NULL),
+                 fBranchNames(task.fBranchNames)
 {
 // Copy ctor.
    fInputs      = new TObjArray((fNinputs)?fNinputs:2);
@@ -194,6 +198,7 @@ AliAnalysisTask& AliAnalysisTask::operator=(const AliAnalysisTask& task)
       fOutputReady[i] = IsOutputReady(i);
       fOutputs->AddAt(new AliAnalysisDataSlot(*task.GetOutputSlot(i)),i);
    }         
+   fBranchNames = task.fBranchNames;
    return *this;
 }
 
@@ -401,6 +406,16 @@ void AliAnalysisTask::EnableBranch(Int_t islot, const char *bname) const
    }
    AliAnalysisDataSlot::EnableBranch(bname, tree);
 }
+
+//______________________________________________________________________________
+void AliAnalysisTask::FinishTaskOutput()
+{
+// Optional method that is called in SlaveTerminate phase. 
+// Used for calling aditional methods just after the last event was processed ON
+// THE WORKING NODE. The call is made also in local case.
+// Do NOT delete output objects here since they will have to be sent for 
+// merging in PROOF mode - use class destructor for cleanup.
+}
       
 //______________________________________________________________________________
 void AliAnalysisTask::ConnectInputData(Option_t *)
@@ -452,14 +467,9 @@ TFile *AliAnalysisTask::OpenFile(Int_t iout, Option_t *option) const
       Error("OpenFile", "No output slot for task %s with index %d", GetName(), iout);
       return NULL;
    }   
-   // We allow file opening also on the slaves (AG)
-//   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
-//   if (!mgr || mgr->GetAnalysisType()==AliAnalysisManager::kProofAnalysis) return;
+   // Method delegated to the analysis manager (A.G. 02/11/09)
    AliAnalysisDataContainer *cont = GetOutputSlot(iout)->GetContainer();
-   TFile *f = NULL;
-   if (strlen(cont->GetFileName())) f = new TFile(cont->GetFileName(), option);
-   if (f && !f->IsZombie()) return f;
-   return NULL;
+   return AliAnalysisManager::OpenFile(cont, option);
 }
 
 //______________________________________________________________________________
@@ -469,6 +479,13 @@ Bool_t AliAnalysisTask::Notify()
    return kTRUE;
 }
 
+//______________________________________________________________________________
+Bool_t AliAnalysisTask::NotifyBinChange()
+{
+// Overload this IF you need to treat bin change in event mixing.
+   return kTRUE;
+}
+
 //______________________________________________________________________________
 void AliAnalysisTask::Terminate(Option_t *)
 {
@@ -546,6 +563,7 @@ void AliAnalysisTask::PrintTask(Option_t *option, Int_t indent) const
    AliAnalysisDataContainer *cont;
    for (Int_t i=0; i<indent; i++) ind += " ";
    if (!dep || (dep && IsChecked())) {
+      printf("______________________________________________________________________________\n");
       printf("%s\n", Form("%stask: %s  ACTIVE=%i POST_LOOP=%i", ind.Data(), GetName(),IsActive(),IsPostEventLoop()));
       if (dep) thistask->SetChecked(kFALSE);
       else {
@@ -564,6 +582,7 @@ void AliAnalysisTask::PrintTask(Option_t *option, Int_t indent) const
       }
    }
    PrintContainers(option, indent+3);
+   if (!fBranchNames.IsNull()) printf("Requested branches:   %s\n", fBranchNames.Data());
 }      
 
 //______________________________________________________________________________
@@ -594,3 +613,18 @@ void AliAnalysisTask::SetPostEventLoop(Bool_t flag)
    }   
 }
    
+//______________________________________________________________________________
+void AliAnalysisTask::GetBranches(const char *type, TString &result) const
+{
+// Get the list of branches for a given type (ESD, AOD). The list of branches
+// requested by a task has to ve declared in the form:
+//   SetBranches("ESD:branch1,branch2,...,branchN AOD:branch1,branch2,...,branchM")
+   result = "";
+   if (fBranchNames.IsNull()) return;
+   Int_t index1 = fBranchNames.Index(type);
+   if (index1<0) return;
+   index1 += 1+strlen(type);
+   Int_t index2 = fBranchNames.Index(" ", index1);
+   if (index2<0) index2 = fBranchNames.Length();
+   result = fBranchNames(index1, index2-index1);
+}