updated the macros to run on the first heavy-ion data

diff --git a/PWG2/FLOW/macros/AddTaskFlowCentrality.C b/PWG2/FLOW/macros/AddTaskFlowCentrality.C
index 12641bcec1b10bacdb683188557cbf90a02898ae..e2fb3d4dc1cb4909da038cdef43aa8f71dd6c994 100644 (file)
--- a/PWG2/FLOW/macros/AddTaskFlowCentrality.C
+++ b/PWG2/FLOW/macros/AddTaskFlowCentrality.C
@@ -279,7 +279,7 @@ void AddTaskFlowCentrality( Int_t refMultMin=0,
   }
   taskFE->SetSubeventEtaRange(minA, maxA, minB, maxB);
   if (UsePhysicsSelection) {
-    taskFE->SelectCollisionCandidates();
+    taskFE->SelectCollisionCandidates(AliVEvent::kUserDefined);
     cout<<"Using Physics Selection"<<endl;
   }
   mgr->AddTask(taskFE);

diff --git a/PWG2/FLOW/macros/CreateAlienHandler.C b/PWG2/FLOW/macros/CreateAlienHandler.C
index ef561b98ff7f70b6e050316dc9aa585e912792be..7b8a113cf536cd2d55f266de3d43e0af02513bb8 100644 (file)
--- a/PWG2/FLOW/macros/CreateAlienHandler.C
+++ b/PWG2/FLOW/macros/CreateAlienHandler.C
@@ -18,25 +18,25 @@ AliAnalysisGrid* CreateAlienHandler() {
 
   // Set versions of used packages
   plugin->SetAPIVersion("V1.1x");
-  plugin->SetROOTVersion("v5-27-06-1");
-  plugin->SetAliROOTVersion("v4-20-12-AN");  
+  plugin->SetROOTVersion("v5-27-06b");
+  plugin->SetAliROOTVersion("v4-21-04-AN");  
   
   // Declare input data to be processed - can be done in two ways:
   // METHOD 1: Create automatically XML collections using alien 'find' command.
   // ============================================================================
   //  Example 1: MC production (set in macro runFlowTask.C: DATA = kFALSE)
-  plugin->SetGridDataDir("/alice/sim/LHC10d4");
-  plugin->SetDataPattern("*AliESDs.root"); // The default data pattern, other may be "*tag.root", "*ESD.tag.root", etc
-  plugin->AddRunNumber(119844); // Alternatively use e.g. plugin->SetRunRange(105044,106044); to add more runs in one go  
-  plugin->SetOutputToRunNo();  
+  //plugin->SetGridDataDir("/alice/sim/LHC10d4");
+  //plugin->SetDataPattern("*AliESDs.root"); // The default data pattern, other may be "*tag.root", "*ESD.tag.root", etc
+  //plugin->AddRunNumber(119844); // Alternatively use e.g. plugin->SetRunRange(105044,106044); to add more runs in one go  
+  //plugin->SetOutputToRunNo(); 
   // ============================================================================
   //  Example 2: Real data (set in macro runFlowTask.C: DATA = kTRUE, MCEP = kFALSE)
-  // plugin->SetGridDataDir("/alice/data/2010/LHC10c");
-  // plugin->SetDataPattern("*ESDs/pass1/*ESDs.root");
-  // plugin->SetRunPrefix("000"); // IMPORTANT!
-  // plugin->AddRunNumber(120244); 
+  plugin->SetGridDataDir("/alice/data/2010/LHC10h");
+  plugin->SetDataPattern("*ESDs/pass1/*ESDs.root");
+  plugin->SetRunPrefix("000"); // IMPORTANT!
+  plugin->AddRunNumber(137042); 
   // plugin->AddRunNumber(119844); // Alternatively use e.g. plugin->SetRunRange(104044,106044); to add more runs in one go 
-  // plugin->SetOutputToRunNo();  
+  plugin->SetOutputToRunNo();  
   // ============================================================================
  
   // METHOD 2: Declare existing data files (raw collections, xml collections, root file)

diff --git a/PWG2/FLOW/macros/runFlowTaskCentralityTrain.C b/PWG2/FLOW/macros/runFlowTaskCentralityTrain.C
index 5d24fe3b0718d6ad5c721885399030de1138b908..c94e6f23afbbb48f1a48d0e4668687e818a254e8 100644 (file)
--- a/PWG2/FLOW/macros/runFlowTaskCentralityTrain.C
+++ b/PWG2/FLOW/macros/runFlowTaskCentralityTrain.C
@@ -12,13 +12,13 @@ const Int_t numberOfCentralityBins = 1;
 Int_t centralityArray[numberOfCentralityBins+1] = {0,10000}; // in terms of reference multiplicity
 TString commonOutputFileName = "outputCentrality"; // e.g.: result for centrality bin 0 will be in the file "outputCentrality0.root", etc
 
-void runFlowTaskCentralityTrain(Int_t mode=mLocal, Int_t nRuns = 10, 
-                 Bool_t DATA = kFALSE, const Char_t* dataDir="/Users/snelling/alice_data/Therminator_midcentral", Int_t offset = 0)
+//void runFlowTaskCentralityTrain(Int_t mode=mLocal, Int_t nRuns = 10, 
+//Bool_t DATA = kFALSE, const Char_t* dataDir="/Users/snelling/alice_data/Therminator_midcentral", Int_t offset = 0)
 
 //void runFlowTaskCentralityTrain(Int_t mode = mPROOF, Int_t nRuns = 50000000, 
-                //Bool_t DATA = kFALSE, const Char_t* dataDir="/PWG4/morsch/HIJING_CENT_4EV", Int_t offset=0) //hijing Pb Pb pilot
+//              Bool_t DATA = kTRUE, const Char_t* dataDir="/alice/data/LHC10e_000130795_p1", Int_t offset=0) //hijing Pb Pb pilot
 
-//void runFlowTaskCentralityTrain(Int_t mode = mGrid, Bool_t DATA = kFALSE)
+void runFlowTaskCentralityTrain(Int_t mode = mGrid, Bool_t DATA = kTRUE)
 {
   // Time:
   TStopwatch timer;
@@ -81,6 +81,9 @@ void runFlowTaskCentralityTrain(Int_t mode=mLocal, Int_t nRuns = 10,
   }
 
   AliPhysicsSelectionTask* physicsSelTask = AddTaskPhysicsSelection();
+  physicsSelTask->GetPhysicsSelection()->AddCollisionTriggerClass("+CTRUE-B-NOPF-ALL");
+  physicsSelTask->GetPhysicsSelection()->AddCollisionTriggerClass("+COSM1-B-NOPF-ALL");
+
   if(!DATA){physicsSelTask->GetPhysicsSelection()->SetAnalyzeMC();}
   // Enable debug printouts:
   mgr->SetDebugLevel(2);
@@ -165,7 +168,7 @@ void LoadLibraries(const anaModes mode)
     SetupPar("AOD");
     SetupPar("ANALYSIS");
     SetupPar("ANALYSISalice");
-        SetupPar("CORRFW");
+    SetupPar("CORRFW");
     SetupPar("PWG2flowCommon");
     cerr<<"PWG2flowCommon.par loaded..."<<endl;
     SetupPar("PWG2flowTasks");
@@ -176,8 +179,6 @@ void LoadLibraries(const anaModes mode)
   // <<<<<<<<<< PROOF mode >>>>>>>>>>>>
   //---------------------------------------------------------
   else if (mode==mPROOF) {
-    //
-    //gEnv->SetValue("XSec.GSI.DelegProxy","2");    
     //  set to debug root versus if needed
     //TProof::Mgr("alicecaf")->SetROOTVersion("v5-24-00a_dbg");
     //TProof::Mgr("alicecaf")->SetROOTVersion("v5-24-00a");
@@ -185,21 +186,15 @@ void LoadLibraries(const anaModes mode)
     // Connect to proof
     printf("*** Connect to PROOF ***\n");
     gEnv->SetValue("XSec.GSI.DelegProxy","2");
-    // Put appropriate username here
-    //TProof::Open("abilandz@alicecaf.cern.ch");
-    //TProof::Open("nkolk@alicecaf.cern.ch");
-    //TProof::Open("snelling@localhost");
     TProof::Open("alice-caf.cern.ch");
     //TProof::Open("skaf.saske.sk");
-    //TProof::Open("prf000-iep-grid.saske.sk");
-    //Info("runSKAF.C","Loading libs on proof (may take while, around 1 min) ...");
-    // list the data available
+     // list the data available
     //gProof->ShowDataSets("/*/*"); 
     //gProof->ShowDataSets("/alice/sim/"); //for MC Data
     //gProof->ShowDataSets("/alice/data/"); //for REAL Data 
  
     // Clear the Packages
-    
+    /*    
     gProof->ClearPackage("STEERBase.par");
     gProof->ClearPackage("ESD.par");
     gProof->ClearPackage("AOD.par");
@@ -209,7 +204,7 @@ void LoadLibraries(const anaModes mode)
     
     gProof->ClearPackage("PWG2flowCommon");
     gProof->ClearPackage("PWG2flowTasks");
-    
+    */
     // Upload the Packages
     gProof->UploadPackage("STEERBase.par");
     gProof->UploadPackage("ESD.par");