Added possibility to redirec the output to special file (to avoid merging on CAF)

diff --git a/ANALYSIS/AliPhysicsSelectionTask.cxx b/ANALYSIS/AliPhysicsSelectionTask.cxx
index ef6826a22daa62f1112bb2aa8d02d80f87516d5b..def25984ce0749c283b0d6bfb94ffb1ab33665be 100644 (file)
--- a/ANALYSIS/AliPhysicsSelectionTask.cxx
+++ b/ANALYSIS/AliPhysicsSelectionTask.cxx
@@ -22,6 +22,7 @@ AliPhysicsSelectionTask::AliPhysicsSelectionTask() :
   AliAnalysisTaskSE("AliPhysicsSelectionTask"),
   fOutput(0),
   fOption(""),
+  fUseSpecialOutput(kFALSE),
   fPhysicsSelection(0)
 {
   //
@@ -33,6 +34,7 @@ AliPhysicsSelectionTask::AliPhysicsSelectionTask(const char* opt) :
   AliAnalysisTaskSE("AliPhysicsSelectionTask"),
   fOutput(0),
   fOption(opt),
+  fUseSpecialOutput(kFALSE),
   fPhysicsSelection(new AliPhysicsSelection())
 {
   //
@@ -45,6 +47,11 @@ AliPhysicsSelectionTask::AliPhysicsSelectionTask(const char* opt) :
   } else {
     AliError("No input event handler connected to analysis manager. No Physics Event Selection.");
   }
+  //
+  TString opts = opt;
+  opts.ToLower();
+  if (opts.Contains("specialoutput")) fUseSpecialOutput = kTRUE;
+
   // Define input and output slots here
   DefineOutput(1, TList::Class());
   fBranchNames = "ESD:AliESDRun.,AliESDHeader.,AliMultiplicity.,AliESDVZERO.,"
@@ -74,6 +81,8 @@ void AliPhysicsSelectionTask::UserCreateOutputObjects()
 
   Printf("AliPhysicsSelectionTask::CreateOutputObjects");
 
+  if (fUseSpecialOutput) OpenFile(1);
+
   fOutput = new TList;
   fOutput->SetOwner();
   

diff --git a/ANALYSIS/AliPhysicsSelectionTask.h b/ANALYSIS/AliPhysicsSelectionTask.h
index 0860f5bc8d8d3092536fd76c27e3de8cca9812f6..702c911e499ed10b1b6943fcb39e7768445b367e 100644 (file)
--- a/ANALYSIS/AliPhysicsSelectionTask.h
+++ b/ANALYSIS/AliPhysicsSelectionTask.h
@@ -27,11 +27,13 @@ class AliPhysicsSelectionTask : public AliAnalysisTaskSE {
     
     void SetPhysicsSelection(AliPhysicsSelection* physicsSelection) { fPhysicsSelection = physicsSelection; }
     AliPhysicsSelection* GetPhysicsSelection() const { return fPhysicsSelection; }
+    void   SetUseSpecialOutput(Bool_t v=kTRUE)         {fUseSpecialOutput = v;}
+    Bool_t GetUseSpecialOutput()               const { return fUseSpecialOutput; }
 
  protected:
     TList* fOutput;                  //! list send on output slot 1
     TString fOption;                 // option string  
-    
+    Bool_t  fUseSpecialOutput;       // do we use special output instead of merging?
     AliPhysicsSelection* fPhysicsSelection; // event selection class
 
  private:

diff --git a/ANALYSIS/macros/AddTaskPhysicsSelection.C b/ANALYSIS/macros/AddTaskPhysicsSelection.C
index 7cefe9b5fdc9e9eef4ee23e68a822a2e87eb1e2b..0bc42dd18c739895d77ba3963b2d598c3be15b08 100644 (file)
--- a/ANALYSIS/macros/AddTaskPhysicsSelection.C
+++ b/ANALYSIS/macros/AddTaskPhysicsSelection.C
@@ -1,4 +1,4 @@
-AliPhysicsSelectionTask* AddTaskPhysicsSelection(Bool_t mCAnalysisFlag = kFALSE, Bool_t deprecatedFlag = kTRUE, UInt_t computeBG = 0) 
+AliPhysicsSelectionTask* AddTaskPhysicsSelection(Bool_t mCAnalysisFlag = kFALSE, Bool_t deprecatedFlag = kTRUE, UInt_t computeBG = 0, Bool_t useSpecialOutput=kFALSE) 
 {
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
   if (!mgr) {
@@ -19,8 +19,8 @@ AliPhysicsSelectionTask* AddTaskPhysicsSelection(Bool_t mCAnalysisFlag = kFALSE,
 
   // Configure analysis
   //===========================================================================
-  AliPhysicsSelectionTask *task = new AliPhysicsSelectionTask("");
-
+  AliPhysicsSelectionTask *task = new AliPhysicsSelectionTask();
+  task->SetUseSpecialOutput(useSpecialOutput); // RS: optionally use special output
   // this makes physics selection to work using AliMultiInputEventHandler
   if (inputHandler && (inputHandler->IsA() == AliMultiInputEventHandler::Class())) {
     AliMultiInputEventHandler *multiInputHandler=(AliMultiInputEventHandler*)inputHandler;
@@ -49,7 +49,9 @@ AliPhysicsSelectionTask* AddTaskPhysicsSelection(Bool_t mCAnalysisFlag = kFALSE,
                 TList::Class(),
                 AliAnalysisManager::kOutputContainer,
                 "EventStat_temp.root");
-               
+  //           
+  if (useSpecialOutput) coutput1->SetSpecialOutput(); // RS: optionally use special output
+  //
   mgr->ConnectInput(task, 0, mgr->GetCommonInputContainer());
   mgr->ConnectOutput(task,1,coutput1);