change also to TaskSE

diff --git a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLYZEventPlane.cxx b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLYZEventPlane.cxx
index 6fe49da4ddcd1fcafe97df3bf410fe59adecef04..46cddce6b960c012ea2de3f854232acab430e7c1 100644 (file)
--- a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLYZEventPlane.cxx
+++ b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLYZEventPlane.cxx
@@ -22,7 +22,7 @@
 #include "TFile.h"
 #include "TList.h"
 
-class AliAnalysisTask;
+class AliAnalysisTaskSE;
 #include "AliAnalysisManager.h"
 #include "AliFlowEventSimple.h"
 #include "AliAnalysisTaskLYZEventPlane.h"
@@ -41,7 +41,7 @@ ClassImp(AliAnalysisTaskLYZEventPlane)
 
 //________________________________________________________________________
 AliAnalysisTaskLYZEventPlane::AliAnalysisTaskLYZEventPlane(const char *name) : 
-  AliAnalysisTask(name, ""), 
+  AliAnalysisTaskSE(name), 
   fEvent(NULL), 
   fLyzEp(NULL),
   fLyz(NULL),
@@ -56,12 +56,13 @@ AliAnalysisTaskLYZEventPlane::AliAnalysisTaskLYZEventPlane(const char *name) :
   DefineInput(0, AliFlowEventSimple::Class());
   DefineInput(1, TList::Class());
   // Output slot #0 writes into a TList container
-  DefineOutput(0, TList::Class());
+  DefineOutput(1, TList::Class());
   
 }
 
 //________________________________________________________________________
 AliAnalysisTaskLYZEventPlane::AliAnalysisTaskLYZEventPlane() : 
+  AliAnalysisTaskSE(),
   fEvent(NULL), 
   fLyzEp(NULL),
   fLyz(NULL),
@@ -81,16 +82,7 @@ AliAnalysisTaskLYZEventPlane::~AliAnalysisTaskLYZEventPlane()
 }
 
 //________________________________________________________________________
-void AliAnalysisTaskLYZEventPlane::ConnectInputData(Option_t *) 
-{
-  // Connect ESD or AOD here
-  // Called once
-  cout<<"AliAnalysisTaskLYZEventPlane::ConnectInputData(Option_t *)"<<endl;
-  
-}
-
-//________________________________________________________________________
-void AliAnalysisTaskLYZEventPlane::CreateOutputObjects() 
+void AliAnalysisTaskLYZEventPlane::UserCreateOutputObjects() 
 {
   // Called once
   cout<<"AliAnalysisTaskLYZEventPlane::CreateOutputObjects()"<<endl;
@@ -120,7 +112,7 @@ void AliAnalysisTaskLYZEventPlane::CreateOutputObjects()
 }
 
 //________________________________________________________________________
-void AliAnalysisTaskLYZEventPlane::Exec(Option_t *) 
+void AliAnalysisTaskLYZEventPlane::UserExec(Option_t *) 
 {
   // Main loop
   // Called for each event
@@ -132,7 +124,7 @@ void AliAnalysisTaskLYZEventPlane::Exec(Option_t *)
   else {
     cout << "Warning no input data!!!" << endl;}
     
-  PostData(0,fListHistos);
+  PostData(1,fListHistos);
   
 }      
 
@@ -141,12 +133,12 @@ void AliAnalysisTaskLYZEventPlane::Terminate(Option_t *)
 {
   // Called once at the end of the query
   AliFlowAnalysisWithLYZEventPlane* fLyzTerm = new AliFlowAnalysisWithLYZEventPlane() ;
-  fListHistos = (TList*)GetOutputData(0);
+  fListHistos = (TList*)GetOutputData(1);
   //cout << "histogram list in Terminate" << endl;
    if (fListHistos) {
       fLyzTerm -> GetOutputHistograms(fListHistos);
       fLyzTerm -> Finish();
-      PostData(0,fListHistos);
+      PostData(1,fListHistos);
       //fListHistos->Print(); 
   } else { cout << "histogram list pointer is empty" << endl;}
 

diff --git a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLYZEventPlane.h b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLYZEventPlane.h
index 6a488ba1225ac9687e7824fb10adf47f93ce715a..283427efd405b416c940499022f98365f280a45a 100644 (file)
--- a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLYZEventPlane.h
+++ b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLYZEventPlane.h
@@ -2,8 +2,8 @@
 * See cxx source for full Copyright notice */
 /* $Id$ */
 
-#ifndef AliAnalysisTaskLYZEventPlane_H
-#define AliAnalysisTaskLYZEventPlane_H
+#ifndef ALIANALYSISTASKLYZEVENTPLANE_H
+#define ALIANALYSISTASKLYZEVENTPLANE_H
 
 // AliAnalysisTaskLYZEventPlane:
 // analysis task for 
@@ -18,17 +18,16 @@ class TFile;
 class TList;
 
 #include "TString.h"
-#include "AliAnalysisTask.h"
+#include "AliAnalysisTaskSE.h"
 
-class AliAnalysisTaskLYZEventPlane : public AliAnalysisTask {
+class AliAnalysisTaskLYZEventPlane : public AliAnalysisTaskSE {
  public:
   AliAnalysisTaskLYZEventPlane();
   AliAnalysisTaskLYZEventPlane(const char *name);
   virtual ~AliAnalysisTaskLYZEventPlane();
   
-  virtual void   ConnectInputData(Option_t *);
-  virtual void   CreateOutputObjects();
-  virtual void   Exec(Option_t *option);
+  virtual void   UserCreateOutputObjects();
+  virtual void   UserExec(Option_t *option);
   virtual void   Terminate(Option_t *);
   
  private:

diff --git a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLeeYangZeros.cxx b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLeeYangZeros.cxx
index 052c4152c096bc382c06122685669c81d5207fb5..e2924ce2c50efd14dddf6a853887db3122abfb6b 100644 (file)
--- a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLeeYangZeros.cxx
+++ b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLeeYangZeros.cxx
@@ -20,7 +20,7 @@
 #include "TList.h"
 #include "TProfile.h"
 
-class AliAnalysisTask;
+class AliAnalysisTaskSE;
 #include "AliAnalysisManager.h"
 #include "AliFlowEventSimple.h"
 #include "AliFlowLYZConstants.h"   
@@ -39,7 +39,7 @@ ClassImp(AliAnalysisTaskLeeYangZeros)
 
 //________________________________________________________________________
 AliAnalysisTaskLeeYangZeros::AliAnalysisTaskLeeYangZeros(const char *name, Bool_t firstrun) : 
-  AliAnalysisTask(name, ""), 
+  AliAnalysisTaskSE(name), 
   fEvent(0),
   fLyz(0),
   fFirstRunFile(0),
@@ -55,12 +55,13 @@ AliAnalysisTaskLeeYangZeros::AliAnalysisTaskLeeYangZeros(const char *name, Bool_
   DefineInput(0, AliFlowEventSimple::Class());
   if (!firstrun) DefineInput(1, TList::Class()); //for second loop 
   // Output slot #0 writes into a TList container
-  DefineOutput(0, TList::Class());  
+  DefineOutput(1, TList::Class());  
    
 } 
 
 //________________________________________________________________________
-AliAnalysisTaskLeeYangZeros::AliAnalysisTaskLeeYangZeros() :  
+AliAnalysisTaskLeeYangZeros::AliAnalysisTaskLeeYangZeros() :
+  AliAnalysisTaskSE(),
   fEvent(0),
   fLyz(0),
   fFirstRunFile(0),
@@ -82,16 +83,7 @@ AliAnalysisTaskLeeYangZeros::~AliAnalysisTaskLeeYangZeros()
 }
 
 //________________________________________________________________________
-void AliAnalysisTaskLeeYangZeros::ConnectInputData(Option_t *) 
-{
-  // Connect ESD or AOD here
-  // Called once
-  cout<<"AliAnalysisTaskLeeYangZeros::ConnectInputData(Option_t *)"<<endl;
- 
-}
-
-//________________________________________________________________________
-void AliAnalysisTaskLeeYangZeros::CreateOutputObjects() 
+void AliAnalysisTaskLeeYangZeros::UserCreateOutputObjects() 
 {
   // Called once
   cout<<"AliAnalysisTaskLeeYangZeros::CreateOutputObjects()"<<endl;
@@ -121,7 +113,7 @@ void AliAnalysisTaskLeeYangZeros::CreateOutputObjects()
 }
 
 //________________________________________________________________________
-void AliAnalysisTaskLeeYangZeros::Exec(Option_t *) 
+void AliAnalysisTaskLeeYangZeros::UserExec(Option_t *) 
 {
   // Main loop
   // Called for each event
@@ -133,7 +125,7 @@ void AliAnalysisTaskLeeYangZeros::Exec(Option_t *)
   else {
     cout << "Warning no input data!!!" << endl; }
   
-  PostData(0,fListHistos); //here for CAF
+  PostData(1,fListHistos); 
   
 }      
 
@@ -146,17 +138,17 @@ void AliAnalysisTaskLeeYangZeros::Terminate(Option_t *)
   fLyzTerm -> SetFirstRun(GetFirstRunLYZ());   //set first run true or false
   fLyzTerm -> SetUseSum(GetUseSumLYZ());       //set use sum true or false
    
-  fListHistos = (TList*)GetOutputData(0);
+  fListHistos = (TList*)GetOutputData(1);
   
   if(fListHistos) 
   {
    fLyzTerm -> GetOutputHistograms(fListHistos);
    fLyzTerm -> Finish();
-       PostData(0,fListHistos);
+       PostData(1,fListHistos);
   } else 
     {
      cout << "histogram list pointer in Lee-Yang Zeros is empty in AliAnalysisTaskLYZ::Terminate ()" << endl;
     } 
 
-  //cout<<".....finished"<<endl;
+  
 }

diff --git a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLeeYangZeros.h b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLeeYangZeros.h
index 787b8f5d8bde8d10dfe8c3d6fdbd72814bf9e251..ed6115d25cca736052d31d59c40d27c9d955f80c 100644 (file)
--- a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLeeYangZeros.h
+++ b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskLeeYangZeros.h
@@ -3,8 +3,8 @@
 /* $Id$ */
 
 
-#ifndef AliAnalysisTaskLeeYangZeros_H
-#define AliAnalysisTaskLeeYangZeros_H
+#ifndef ALIANALYSISTASKLEEYANGZEROS_H
+#define ALIANALYSISTASKLEEYANGZEROS_H
 
 // AliAnalysisTaskLeeYangZeros:
 // analysis task for 
@@ -18,17 +18,16 @@ class TFile;
 class TList;
 
 #include "TString.h"
-#include "AliAnalysisTask.h"
+#include "AliAnalysisTaskSE.h"
 
-class AliAnalysisTaskLeeYangZeros : public AliAnalysisTask {
+class AliAnalysisTaskLeeYangZeros : public AliAnalysisTaskSE {
  public:
   AliAnalysisTaskLeeYangZeros();
   AliAnalysisTaskLeeYangZeros(const char *name, Bool_t firstrun);
   virtual ~AliAnalysisTaskLeeYangZeros();
   
-  virtual void   ConnectInputData(Option_t *);
-  virtual void   CreateOutputObjects();
-  virtual void   Exec(Option_t *option);
+  virtual void   UserCreateOutputObjects();
+  virtual void   UserExec(Option_t *option);
   virtual void   Terminate(Option_t *);
 
   //lyz flags

diff --git a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskMCEventPlane.cxx b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskMCEventPlane.cxx
index c088dd4449b03570d6928860d411b8f2a8c54a68..1ec6981d113402398d33664a1f02ea8fd476d291 100644 (file)
--- a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskMCEventPlane.cxx
+++ b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskMCEventPlane.cxx
@@ -19,7 +19,7 @@
 #include "TList.h"
 
 
-class AliAnalysisTask;
+class AliAnalysisTaskSE;
 #include "AliAnalysisManager.h"
 #include "AliFlowEventSimple.h"
 
@@ -39,7 +39,7 @@ ClassImp(AliAnalysisTaskMCEventPlane)
 
 //________________________________________________________________________
 AliAnalysisTaskMCEventPlane::AliAnalysisTaskMCEventPlane(const char *name) : 
-  AliAnalysisTask(name, ""), 
+  AliAnalysisTaskSE(name), 
   fEvent(NULL),
   fMc(NULL),
   fListHistos(NULL)
@@ -51,11 +51,12 @@ AliAnalysisTaskMCEventPlane::AliAnalysisTaskMCEventPlane(const char *name) :
   // Input slot #0 works with a TChain
   DefineInput(0, AliFlowEventSimple::Class());
   // Output slot #0 writes into a TList container
-  DefineOutput(0, TList::Class()); 
+  DefineOutput(1, TList::Class()); 
 }
 
 //________________________________________________________________________
 AliAnalysisTaskMCEventPlane::AliAnalysisTaskMCEventPlane() : 
+  AliAnalysisTaskSE(),
   fEvent(NULL),
   fMc(NULL),
   fListHistos(NULL)
@@ -74,16 +75,7 @@ AliAnalysisTaskMCEventPlane::~AliAnalysisTaskMCEventPlane()
 }
 
 //________________________________________________________________________
-void AliAnalysisTaskMCEventPlane::ConnectInputData(Option_t *) 
-{
-  // Connect ESD or AOD here
-  // Called once
-  cout<<"AliAnalysisTaskMCEventPlane::ConnectInputData(Option_t *)"<<endl;
-
-}
-
-//________________________________________________________________________
-void AliAnalysisTaskMCEventPlane::CreateOutputObjects() 
+void AliAnalysisTaskMCEventPlane::UserCreateOutputObjects() 
 {
   // Called once
   cout<<"AliAnalysisTaskMCEventPlane::CreateOutputObjects()"<<endl;
@@ -103,7 +95,7 @@ void AliAnalysisTaskMCEventPlane::CreateOutputObjects()
 }
 
 //________________________________________________________________________
-void AliAnalysisTaskMCEventPlane::Exec(Option_t *) 
+void AliAnalysisTaskMCEventPlane::UserExec(Option_t *) 
 {
   // Main loop
   // Called for each event
@@ -116,7 +108,7 @@ void AliAnalysisTaskMCEventPlane::Exec(Option_t *)
     cout << "Warning no input data!!!" << endl;
   }
 
-  PostData(0,fListHistos); 
+  PostData(1,fListHistos); 
 }      
 
 
@@ -127,16 +119,14 @@ void AliAnalysisTaskMCEventPlane::Terminate(Option_t *)
   AliFlowAnalysisWithMCEventPlane* fMcTerm = new AliFlowAnalysisWithMCEventPlane() ;
 
   //Get output data
-  fListHistos = (TList*)GetOutputData(0);
-  // cout << "histogram list in Terminate" << endl;
+  fListHistos = (TList*)GetOutputData(1);
   if (fListHistos) {
-     fMcTerm->GetOutputHistograms(fListHistos);
-     fMcTerm->Finish();
-     PostData(0,fListHistos);
-     //fListHistos->Print();
-    } else 
-      { 
-       cout << "histogram list pointer is empty" << endl;
-      }
+    fMcTerm->GetOutputHistograms(fListHistos);
+    fMcTerm->Finish();
+    PostData(1,fListHistos);
+  } else 
+    { 
+      cout << "histogram list pointer is empty" << endl;
+    }
 }
 

diff --git a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskMCEventPlane.h b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskMCEventPlane.h
index e47562c9504b2d4d8823b6e8cff4c3b1da299f5d..20dc9b920aae348ee1257b3c6035b1221e9de90a 100644 (file)
--- a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskMCEventPlane.h
+++ b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskMCEventPlane.h
@@ -2,8 +2,8 @@
 * See cxx source for full Copyright notice */
 /* $Id$ */
 
-#ifndef AliAnalysisTaskMCEventPlane_H
-#define AliAnalysisTaskMCEventPlane_H
+#ifndef ALIANALYSISTASKMCEVENTPLANE_H
+#define ALIANALYSISTASKMCEVENTPLANE_H
 
 // AliAnalysisTaskMCEventPlane:
 // analysis task for 
@@ -16,18 +16,17 @@ class AliFlowAnalysisWithMCEventPlane;
 class TList;
 
 #include "TString.h"
-#include "AliAnalysisTask.h"
+#include "AliAnalysisTaskSE.h"
 
-class AliAnalysisTaskMCEventPlane : public AliAnalysisTask {
+class AliAnalysisTaskMCEventPlane : public AliAnalysisTaskSE {
  public:
 
   AliAnalysisTaskMCEventPlane();
   AliAnalysisTaskMCEventPlane(const char *name);
   virtual ~AliAnalysisTaskMCEventPlane();
   
-  virtual void   ConnectInputData(Option_t *);
-  virtual void   CreateOutputObjects();
-  virtual void   Exec(Option_t *option);
+  virtual void   UserCreateOutputObjects();
+  virtual void   UserExec(Option_t *option);
   virtual void   Terminate(Option_t *);
 
  private:

diff --git a/PWG2/FLOW/macros/AddTaskFlow.C b/PWG2/FLOW/macros/AddTaskFlow.C
index 442fb21b1a296adc513b47a7a01a270accde62a9..3332691d9a13d3333e825788345afe611a7fae32 100644 (file)
--- a/PWG2/FLOW/macros/AddTaskFlow.C
+++ b/PWG2/FLOW/macros/AddTaskFlow.C
@@ -34,7 +34,7 @@ Double_t vertexZmax = 15.0; //1.e99;
 
 //Bool_t UseMultCut = kFALSE;
 Bool_t UseMultCut = kTRUE;
-const Int_t multmin = 10;     //used for AliFlowEventSimple (to set the centrality)
+const Int_t multmin = 1;     //used for AliFlowEventSimple (to set the centrality)
 const Int_t multmax = 10000;     //used for AliFlowEventSimple (to set the centrality)
 //const Int_t multmin = 10;     //used for AliFlowEventSimple (to set the centrality)
 //const Int_t multmax = 1000000;     //used for AliFlowEventSimple (to set the centrality)
@@ -775,7 +775,7 @@ AliAnalysisTaskFlowEvent* AddTaskFlow(TString type, Bool_t* METHODS, Bool_t QA,
     
     AliAnalysisDataContainer *coutputLYZ1SUM = mgr->CreateContainer("cobjLYZ1SUM", TList::Class(),AliAnalysisManager::kOutputContainer,outputLYZ1SUM); 
     mgr->ConnectInput(taskLYZ1SUM,0,coutputFE); 
-    mgr->ConnectOutput(taskLYZ1SUM,0,coutputLYZ1SUM); 
+    mgr->ConnectOutput(taskLYZ1SUM,1,coutputLYZ1SUM); 
   }
   if(LYZ1PROD) {
     TString outputLYZ1PROD = AliAnalysisManager::GetCommonFileName();
@@ -784,7 +784,7 @@ AliAnalysisTaskFlowEvent* AddTaskFlow(TString type, Bool_t* METHODS, Bool_t QA,
     
     AliAnalysisDataContainer *coutputLYZ1PROD = mgr->CreateContainer("cobjLYZ1PROD", TList::Class(),AliAnalysisManager::kOutputContainer,outputLYZ1PROD); 
     mgr->ConnectInput(taskLYZ1PROD,0,coutputFE); 
-    mgr->ConnectOutput(taskLYZ1PROD,0,coutputLYZ1PROD);
+    mgr->ConnectOutput(taskLYZ1PROD,1,coutputLYZ1PROD);
   }
   if(LYZ2SUM) {
     AliAnalysisDataContainer *cinputLYZ2SUM = mgr->CreateContainer("cobjLYZ2SUMin",TList::Class(),AliAnalysisManager::kInputContainer);
@@ -795,7 +795,7 @@ AliAnalysisTaskFlowEvent* AddTaskFlow(TString type, Bool_t* METHODS, Bool_t QA,
     AliAnalysisDataContainer *coutputLYZ2SUM = mgr->CreateContainer("cobjLYZ2SUM", TList::Class(),AliAnalysisManager::kOutputContainer,outputLYZ2SUM); 
     mgr->ConnectInput(taskLYZ2SUM,0,coutputFE); 
     mgr->ConnectInput(taskLYZ2SUM,1,cinputLYZ2SUM);
-    mgr->ConnectOutput(taskLYZ2SUM,0,coutputLYZ2SUM); 
+    mgr->ConnectOutput(taskLYZ2SUM,1,coutputLYZ2SUM); 
     cinputLYZ2SUM->SetData(fInputListLYZ2SUM);
   }
   if(LYZ2PROD) {
@@ -807,7 +807,7 @@ AliAnalysisTaskFlowEvent* AddTaskFlow(TString type, Bool_t* METHODS, Bool_t QA,
     AliAnalysisDataContainer *coutputLYZ2PROD = mgr->CreateContainer("cobjLYZ2PROD", TList::Class(),AliAnalysisManager::kOutputContainer,outputLYZ2PROD); 
     mgr->ConnectInput(taskLYZ2PROD,0,coutputFE); 
     mgr->ConnectInput(taskLYZ2PROD,1,cinputLYZ2PROD);
-    mgr->ConnectOutput(taskLYZ2PROD,0,coutputLYZ2PROD); 
+    mgr->ConnectOutput(taskLYZ2PROD,1,coutputLYZ2PROD); 
     cinputLYZ2PROD->SetData(fInputListLYZ2PROD);
   }
   if(LYZEP) {
@@ -819,7 +819,7 @@ AliAnalysisTaskFlowEvent* AddTaskFlow(TString type, Bool_t* METHODS, Bool_t QA,
     AliAnalysisDataContainer *coutputLYZEP = mgr->CreateContainer("cobjLYZEP", TList::Class(),AliAnalysisManager::kOutputContainer,outputLYZEP); 
     mgr->ConnectInput(taskLYZEP,0,coutputFE); 
     mgr->ConnectInput(taskLYZEP,1,cinputLYZEP);
-    mgr->ConnectOutput(taskLYZEP,0,coutputLYZEP); 
+    mgr->ConnectOutput(taskLYZEP,1,coutputLYZEP); 
     cinputLYZEP->SetData(fInputListLYZEP);
   }
   if(GFC) {
@@ -868,7 +868,7 @@ AliAnalysisTaskFlowEvent* AddTaskFlow(TString type, Bool_t* METHODS, Bool_t QA,
     
     AliAnalysisDataContainer *coutputMCEP = mgr->CreateContainer("cobjMCEP", TList::Class(),AliAnalysisManager::kOutputContainer,outputMCEP); 
     mgr->ConnectInput(taskMCEP,0,coutputFE); 
-    mgr->ConnectOutput(taskMCEP,0,coutputMCEP); 
+    mgr->ConnectOutput(taskMCEP,1,coutputMCEP); 
   }
   if(MH) {
     TString outputMH = AliAnalysisManager::GetCommonFileName();