From Mikolaj: Updated AddTaskFlowCentralityPID macros

diff --git a/PWGCF/FLOW/macros/AddTaskFlowCentralityPID.C b/PWGCF/FLOW/macros/AddTaskFlowCentralityPID.C
index acd3c064b047f001bc153357068d3040f6b0f68e..ae2a31d684ff8816c3bee387f51139d32745b6a8 100644 (file)
--- a/PWGCF/FLOW/macros/AddTaskFlowCentralityPID.C
+++ b/PWGCF/FLOW/macros/AddTaskFlowCentralityPID.C
@@ -48,10 +48,12 @@ void AddTaskFlowCentralityPID( Float_t centrMin=0.,
 
   // RUN SETTINGS
   // Flow analysis method can be:(set to kTRUE or kFALSE)
-  Bool_t MCEP     = kFALSE;  // correlation with Monte Carlo reaction plane
-  Bool_t SP       = kFALSE;  // scalar product method (similar to eventplane method)
-  Bool_t GFC      = kFALSE;  // cumulants based on generating function
+  Bool_t SP       = kTRUE;  // scalar product method (similar to eventplane method)
   Bool_t QC       = kTRUE;  // cumulants using Q vectors
+  
+  //these are OBSOLETE, use at own peril
+  Bool_t GFC      = kFALSE;  // cumulants based on generating function
+  Bool_t MCEP     = kFALSE;  // correlation with Monte Carlo reaction plane
   Bool_t FQD      = kFALSE;  // fit of the distribution of the Q vector (only integrated v)
   Bool_t LYZ1SUM  = kFALSE;  // Lee Yang Zeroes using sum generating function (integrated v)
   Bool_t LYZ1PROD = kFALSE;  // Lee Yang Zeroes using product generating function (integrated v)
@@ -91,9 +93,6 @@ void AddTaskFlowCentralityPID( Float_t centrMin=0.,
   //cutsEvent->SetCentralityPercentileMethod(AliFlowEventCuts::kSPD1tracklets);
   cutsEvent->SetNContributorsRange(2);
   cutsEvent->SetPrimaryVertexZrange(-7.,7.);
-  cutsEvent->SetCutSPDvertexerAnomaly(); //"Francesco's cut"
-  cutsEvent->SetCutZDCtiming();
-  cutsEvent->SetCutTPCmultiplicityOutliers();
   cutsEvent->SetQA(doQA);
   
   // RP TRACK CUTS:

diff --git a/PWGCF/FLOW/macros/runFlowTaskCentralityPIDTrain.C b/PWGCF/FLOW/macros/runFlowTaskCentralityPIDTrain.C
index 75093144513b3ff240be8cdbdc422177aa189236..b008aa5cab55a06dc188a2edc906cf91f0929b3b 100644 (file)
--- a/PWGCF/FLOW/macros/runFlowTaskCentralityPIDTrain.C
+++ b/PWGCF/FLOW/macros/runFlowTaskCentralityPIDTrain.C
@@ -7,8 +7,8 @@ Float_t centralityArray[numberOfCentralityBins+1] = {0.,5.,10.,20.,30.,40.,50.,6
 
 TString commonOutputFileName = "outputCentrality"; // e.g.: result for centrality bin 0 will be in the file "outputCentrality0.root", etc
 
-void runFlowTaskCentralityPIDTrain( Int_t mode = mGrid,
-                                    Bool_t useFlowParFiles = kTRUE,
+void runFlowTaskCentralityPIDTrain( Int_t mode = mLocal,
+                                    Bool_t useFlowParFiles = kFALSE,
                                     Bool_t DATA = kTRUE,
                                     const Char_t* dataDir="fileList",
                                     Int_t nEvents = 1e4,
@@ -27,7 +27,7 @@ void runFlowTaskCentralityPIDTrain( Int_t mode = mGrid,
   // Chains:
   if(mode == mLocal)
   {
-    gROOT->LoadMacro("$ALICE_ROOT/PWG0/CreateESDChain.C");
+    gROOT->LoadMacro("$ALICE_ROOT/PWGUD/macros/CreateESDChain.C");
     TChain* chain = CreateESDChain(dataDir, nEvents, offset);
     //TChain* chain = CreateAODChain(dataDir, nEvents, offset);
   }
@@ -58,15 +58,14 @@ void runFlowTaskCentralityPIDTrain( Int_t mode = mGrid,
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask* centSelTask = AddTaskCentrality();
   if (!DATA) centSelTask->SetMCInput();
-  if (DATA) centSelTask->SetPass(1);
 
   //add the PID response task
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPIDResponse.C");
-  AliAnalysisTaskPIDResponse* pidresponsetask = AddTaskPIDResponse(!DATA)
+  AliAnalysisTaskPIDResponse* pidresponsetask = AddTaskPIDResponse(!DATA);
 
   //Add the TOF tender
-  gROOT->LoadMacro("$ALICE_ROOT/PWG/FLOW/macros/AddTaskTenderTOF.C");
-  AddTaskTenderTOF();
+  //gROOT->LoadMacro("$ALICE_ROOT/PWGCF/FLOW/macros/AddTaskTenderTOF.C");
+  //AddTaskTenderTOF();
 
   // Setup analysis per centrality bin:
   gROOT->LoadMacro("AddTaskFlowCentralityPID.C");