Split: fix refs to AddTaskCentrality.C
authordberzano <dario.berzano@cern.ch>
Fri, 16 Jan 2015 18:08:20 +0000 (19:08 +0100)
committerdberzano <dario.berzano@cern.ch>
Sun, 18 Jan 2015 23:01:07 +0000 (00:01 +0100)
88 files changed:
ANALYSIS/macros/AODtrain.C
ANALYSIS/macros/AODtrainsim.C
ANALYSIS/macros/AnalysisTrainFilterMC.C
ANALYSIS/macros/AnalysisTrainNewFilterAOD.C
ANALYSIS/macros/AnalysisTrainNewFilterAODMC.C
ANALYSIS/macros/QAtrain.C
ANALYSIS/macros/QAtrain_duo.C
ANALYSIS/macros/QAtrainsim.C
HLT/QA/tasks/macros/compare-HLT-offline-grid.C
HLT/QA/tasks/macros/compare-HLT-offline-local.C
HMPID/AnalysisTrainHMPID.C
MFT/AODtrain.C
PMD/anal/runPmdTask.C
PWG/EMCAL/macros/runEMCalAnalysis.C
PWG/muon/runNorm.C
PWG/muondep/AccEffTemplates/AODtrainsim.C
PWGCF/Correlations/DPhi/FourierDecomposition/lrc/RunDhcTask.C
PWGCF/Correlations/macros/jcorran/runGrid.C
PWGCF/EBYE/PIDFluctuation/task/SteerAnalysisTaskPIDFluctuation.C
PWGCF/EBYE/PIDFluctuation/task/SteerESDAnalysisTaskPIDFluctuation.C
PWGCF/EBYE/macros/runBalanceFunction.C
PWGCF/EBYE/macros/runBalanceFunctionCentrality.C
PWGCF/EBYE/macros/runBalanceFunctionMC.C
PWGCF/EBYE/macros/runBalanceFunctionPID.C
PWGCF/EBYE/macros/runBalanceFunctionPsi.C
PWGCF/EBYE/macros/runBalancePsiEfficiencyTaskCentralityTrain.C
PWGCF/EBYE/macros/runEffContTaskCentralityTrain.C
PWGCF/EBYE/macros/runEfficiencyTaskCentralityTrain.C
PWGCF/EBYE/macros/runTaskFluctuations.C
PWGCF/EBYE/macros/runTaskFluctuationsCentralityTrain.C
PWGCF/FEMTOSCOPY/macros/Train/ProtonLambdaFemto/runBatch.C
PWGCF/FLOW/macros/Kinks/runFlowTaskCentralityKinkTrain.C
PWGCF/FLOW/macros/runFlowTask.C
PWGCF/FLOW/macros/runFlowTaskCentralityPIDMHTrain.C
PWGCF/FLOW/macros/runFlowTaskCentralityPIDTrain.C
PWGCF/FLOW/macros/runFlowTaskCentralityTrain.C
PWGCF/FLOW/macros/runFlowTaskCentralityTrain4Candidates.C
PWGCF/FLOW/macros/runTaskFlowHigherOrdersAllPID.C
PWGDQ/dielectron/TakuAlberica/single/get_dedx.C
PWGDQ/dielectron/TakuAlberica/single/runTaku.C
PWGDQ/dielectron/TakuAlberica/single/runTakuMC.C
PWGDQ/dielectron/macrosLMEE/testing/runGridPbPb.C
PWGGA/CaloTrackCorrelations/macros/ana.C
PWGGA/GammaConv/macros/AddTask_GammaConvV1.C
PWGGA/PHOSTasks/PHOS_PbPb/macros/GRID/Pi0Spectrum.C
PWGGA/PHOSTasks/PHOS_PbPbQA/macros/PHOSPbPb.C
PWGGA/PHOSTasks/PHOS_embedding/Embedding.C
PWGHF/hfe/macros/test/runGridPbPb.C
PWGHF/hfe/macros/test/runGridpPb.C
PWGHF/vertexingHF/AliAnalysisTaskSEVertexingHFTest.C
PWGJE/EMCALJetTasks/macros/runEMCalJetAnalysis.C
PWGJE/EMCALJetTasks/macros/runJetAna.C
PWGJE/FlavourJetTasks/macros/AddTasksEmcalJetFilter.C
PWGJE/FlavourJetTasks/macros/AddTasksEmcalJetV0CF.C
PWGJE/FlavourJetTasks/macros/AddTasksEmcalJetV0Filter.C
PWGJE/FlavourJetTasks/macros/AddTasksPicoV0Filter.C
PWGJE/macros/AnalysisTrainPWGJets.C
PWGJE/macros/examples/simpleAODtrainJETAN.C
PWGLF/FORWARD/analysis2/sim/AOD.C
PWGLF/FORWARD/analysis2/sim/QA.C
PWGLF/RESONANCES/macros/lego_train/AddAMRsn.C
PWGLF/RESONANCES/macros/lego_train/old/AddAMRsn.C
PWGLF/RESONANCES/macros/mini/AnalysisSetupLStarPPb.C
PWGLF/RESONANCES/macros/mini/AnalysisSetupRsnMini.C
PWGLF/RESONANCES/macros/mini/AnalysisSetupSigmaStar.C
PWGLF/SPECTRA/ChargedHadrons/multPbPb/run.C
PWGLF/SPECTRA/IdentifiedHighPt/grid/runAAF.C
PWGLF/SPECTRA/Nuclei/B2/macros/runLocalExample.C
PWGLF/SPECTRA/ParticleEfficiency/SteerAnalysisTaskParticleEfficiency.C
PWGLF/SPECTRA/PiKaPr/TOF/PbPb276/task/SteerAnalysisTaskTOFSpectraPbPb.C
PWGLF/SPECTRA/PiKaPr/TOF/pPb502/task/SteerAnalysisTaskTOFSpectraPbPb.C
PWGLF/STRANGENESS/Cascades/macros/runGridCascadePbPb.C
PWGLF/STRANGENESS/Cascades/macros/runProofCascadePbPb.C
PWGLF/STRANGENESS/LambdaK0PbPb/MainStreamAnalysis/run.C
PWGLF/STRANGENESS/LambdaK0PbPb/MainStreamAnalysis/runQA.C
PWGLF/STRANGENESS/LambdaK0PbPb/run.C
PWGLF/STRANGENESS/LambdaK0PbPb/runAOD.C
PWGLF/STRANGENESS/LambdaK0PbPb/runLK0Spectra.C
PWGLF/STRANGENESS/LambdaK0PbPb/runQA.C
PWGLF/totEt/macros/runCaloEt.C
PWGLF/totEt/macros/runHadEt.C
PWGPP/CalibMacros/CPass1/QAtrain_duo.C
PWGPP/MUON/dep/MuonResolution.C
PWGPP/PilotTrain/PilotAnalysis.C
PWGPP/VZERO/runAnaEPFlatenningProof.C
PWGPP/VZERO/runAnaTrigProof.C
PWGUD/multVScentPbPb/MyAnalysisMacroTrackletMulti.C
T0/runGridT0.C

index 13ecd40..559e810 100644 (file)
@@ -211,7 +211,7 @@ void AddAnalysisTasks(const char *cdb_location){
    
    // Centrality (only Pb-Pb)
    if (useCentrality) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+      gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
       AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
       //taskCentrality->SelectCollisionCandidates(AliVEvent::kAny);
    }
index 17b5c41..c06d55c 100644 (file)
@@ -184,7 +184,7 @@ void AddAnalysisTasks(const char *cdb_location){
     }
    // Centrality (only Pb-Pb)
    if (useCentrality) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+      gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
       AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
       taskCentrality->SetMCInput();
     //  taskCentrality->SelectCollisionCandidates(AliVEvent::kAny);
index 30a72e9..d28c9cd 100644 (file)
@@ -390,7 +390,7 @@ void AddAnalysisTasks(){
    }
    
    if (useCentrality) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+      gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
       AliCentralitySelectionTask *taskCentrality = AddTaskCentrality(); 
    }
    
index 1d525de..de08cd4 100644 (file)
@@ -375,7 +375,7 @@ void AddAnalysisTasks()
    }
    
    if (useCentrality) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+      gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
       AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();   
    }
    
index 66ea8c3..1dbd54c 100644 (file)
@@ -372,7 +372,7 @@ void AddAnalysisTasks()
    }
    
    if (useCentrality) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+      gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
       AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();   
    }
 
index d2c2bcc..b339655 100644 (file)
@@ -162,7 +162,7 @@ void AddAnalysisTasks()
         printf("Disabling centrality task for p-p\n");
         doCentrality = kFALSE;
      } else {           
-        gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+        gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
         AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
      }   
   }   
index 54355f2..b4bfbc6 100644 (file)
@@ -241,7 +241,7 @@ void AddAnalysisTasks(const char *suffix, const char *cdb_location)
 //        printf("Disabling centrality task for p-p\n");
 //        doCentrality = kFALSE;
 //     } else {           
-        gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+        gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
         AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
       AliAnalysisDataContainer *centralityout = (AliAnalysisDataContainer*)mgr->GetOutputs()->FindObject("CentralityStat");
       centralityout->SetFileName(Form("EventStat_temp%s.root", suffix));
index a943b68..a0a013c 100644 (file)
@@ -187,7 +187,7 @@ void AddAnalysisTasks(const char *cdb_location)
 //        printf("Disabling centrality task for p-p\n");
 //        doCentrality = kFALSE;
 //     } else {           
-        gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+        gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
         AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
         taskCentrality->SetMCInput();        
 //     }   
index e1b99e5..7978649 100644 (file)
@@ -203,7 +203,7 @@ void compare_HLT_offline_grid( TString runNumber
      mgr->AddTask(taskCB);     
      taskCB->SetBeamType(beamType);
      if(beamType.Contains("Pb-Pb")){
-        gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+        gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
         AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
        taskCentrality->SetPass(1); 
      }  
index 4e88a11..6f647e7 100644 (file)
@@ -243,7 +243,7 @@ void compare_HLT_offline_local( TString file
     taskGLOBAL->SetBeamType(beamType);
     mgr->AddTask(taskGLOBAL);
     if(beamType.Contains("Pb")){
-       gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+       gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
        AliCentralitySelectionTask *taskCentrality = AddTaskCentrality(); 
        taskCentrality->SetPass(1);
     }       
@@ -281,7 +281,7 @@ void compare_HLT_offline_local( TString file
      mgr->AddTask(taskCB); 
      taskCB->SetBeamType(beamType);
      if(beamType.Contains("Pb")){
-        gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+        gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
         AliCentralitySelectionTask *taskCentrality = AddTaskCentrality(); 
        taskCentrality->SetPass(1);
      }        
index 2beb406..5045d5f 100644 (file)
@@ -243,7 +243,7 @@ void AnalysisTrainHMPID(const char *analysis_mode="local", const char *plugin_mo
    }
    
    if(iCentrality && !iAODanalysis){
-     gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+     gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
      AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
      taskCentrality->SetPass(2); // remember to set the pass you are processing!!!   
    }     
index fe369f8..1e3fb80 100644 (file)
@@ -174,7 +174,7 @@ void AddAnalysisTasks(Int_t merge, const char *cdb_location){
    }
    // Centrality (only Pb-Pb)
    if (iCollision && useCentrality) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+      gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
       AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
       taskCentrality->SelectCollisionCandidates(AliVEvent::kAny);
    }
index 0c7696a..61bcef9 100644 (file)
@@ -77,7 +77,7 @@ void runPmdTask(Bool_t         isGrid = 0,
     AliPhysicsSelectionTask* physicsSelTask = AddTaskPhysicsSelection(isMC);
     physicsSelTask->GetPhysicsSelection()->SetAnalyzeMC();
 
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *centralityTask = AddTaskCentrality();
   } else {
     AliVEventHandler* esdH = new AliESDInputHandler();
@@ -85,7 +85,7 @@ void runPmdTask(Bool_t         isGrid = 0,
     gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C");
     AliPhysicsSelectionTask* physicsSelTask = AddTaskPhysicsSelection(isMC);
     
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *centralityTask = AddTaskCentrality();
   }
 
index 74d49fc..e1126d4 100644 (file)
@@ -130,7 +130,7 @@ void runEMCalAnalysis(
 
   // Centrality task
   if (usedData == "ESD") {
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *centralityTask = AddTaskCentrality(kTRUE);
   }
 
index 0f1f0a6..b9a46f3 100644 (file)
@@ -83,7 +83,7 @@ void runNorm(TString inputFileName = "AliAOD.root", Int_t nEvents = 1e6, TString
   }
   if ( isESD ){
     // event centrality
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
     if ( !taskCentrality ) {
       Error("runLocal on ESD","AliCentralitySelectionTask not created!");
@@ -94,7 +94,7 @@ void runNorm(TString inputFileName = "AliAOD.root", Int_t nEvents = 1e6, TString
   }
   /*else {
     //Only on full AOD it is possible to reprocess the centrality framework
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *taskCentrality = AddTaskCentrality(kTRUE,kTRUE);
     if ( !taskCentrality ) {
       Error("runLocal on AOD","AliCentralitySelectionTask not created!");
index 9b7abc4..7bb84bb 100644 (file)
@@ -165,7 +165,7 @@ void AddAnalysisTasks(Int_t merge){
   }
   // Centrality (only Pb-Pb)
   if (iCollision && useCentrality) {
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
     taskCentrality->SelectCollisionCandidates(AliVEvent::kAny);
   }
index 29ff0d0..80ed8d0 100644 (file)
@@ -68,7 +68,7 @@ void LocalSetup()
   
   // Load macros/tasks
   if (dataType == "esd") {
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   }
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C");
   // gROOT->LoadMacro("AliPool.cxx+g");  
@@ -134,7 +134,7 @@ void ProofSetup()
 void AddDhcTask()
 {
   // Need the following macros loaded beforehand:
-  // "$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C" (ESD only)
+  // "$ALICE_ROOT/OADB/macros/AddTaskCentrality.C" (ESD only)
   // "$ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C"
   // "AliDhcTask.cxx+g"
 
index 5c7e4d2..99ab324 100755 (executable)
@@ -75,7 +75,7 @@ void runGrid(){
   mgr->AddStatisticsTask();
 
   //==== CENTRALITY
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality = AddTaskCentrality(); 
   //taskCentrality->SetPass(2);
 
index b08b61b..5aa09c0 100644 (file)
@@ -56,7 +56,7 @@ SteerAnalysisTaskPIDFluctuation(const Char_t *inputfilename, Int_t maxFiles = kM
   /* add tasks */
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C");
   AliPhysicsSelectionTask* physSelTask = AddTaskPhysicsSelection(kFALSE);
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *centralityTask = AddTaskCentrality(); 
   gROOT->LoadMacro("AddAnalysisTaskPIDFluctuation.C");
   AliAnalysisTaskPIDFluctuation *thisTask = AddAnalysisTaskPIDFluctuation();
index 3097c04..6b41cd3 100644 (file)
@@ -56,7 +56,7 @@ SteerESDAnalysisTaskPIDFluctuation(const Char_t *inputfilename, Int_t maxFiles =
   /* add tasks */
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C");
   AliPhysicsSelectionTask* physSelTask = AddTaskPhysicsSelection(kFALSE);
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *centralityTask = AddTaskCentrality(); 
   gROOT->LoadMacro("AddAnalysisTaskPIDFluctuation.C");
 
index 81d35af..cd07f0b 100644 (file)
@@ -149,7 +149,7 @@ void runBalanceFunction(
     //Add the centrality determination task and the physics selection 
     // (only on ESD level, in AODs centrality is already in header and events are selected)
     if(!bAOD){
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+      gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
       AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
 
       // Add physics selection task (NOT needed for AODs)
index 5c5553f..32ceb19 100644 (file)
@@ -136,7 +136,7 @@ void runBalanceFunctionCentrality(Int_t mode = mLocal, Bool_t DATA = kTRUE) {
   
   //Add the centrality determination task
     if ((analysisType == "ESD")||(analysisType == "MCESD")){
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *centralityTask = AddTaskCentrality();
     centralityTask->SetMCInput();
     //centralityTask->SetPass(2);
index 8cb0520..8700c93 100644 (file)
@@ -94,7 +94,7 @@ void runBalanceFunctionMC(Int_t mode = mLocal,
   }   
 
   if(mAOD){
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
 
     // Add physics selection task (NOT needed for AODs)
index 1e2c6cc..c6be770 100644 (file)
@@ -171,7 +171,7 @@ void runBalanceFunction(
 
     // (only on ESD level, in AODs centrality is already in header and events are selected)
     if(!bAOD){
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+      gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
       AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
 
       // Add physics selection task (NOT needed for AODs)
index 07de0bd..cca354e 100644 (file)
@@ -196,7 +196,7 @@ void runBalanceFunctionPsi(
     //Add the centrality determination task and the physics selection 
     // (only on ESD level, in AODs centrality is already in header and events are selected)
     if((!bAOD)&&(!bMCtruth)){
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+      gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
       AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
 
       // Add physics selection task (NOT needed for AODs)
index 6ab01e5..c46e1c4 100644 (file)
@@ -84,7 +84,7 @@ void runBalancePsiEfficiencyTaskCentralityTrain(Int_t mode = mLocal, Bool_t DATA
   mgr->SetDebugLevel(2);
   
   //Add the centrality determination task
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *centralityTask = AddTaskCentrality();
   centralityTask->SetMCInput();
   //centralityTask->SetPass(2);
index 08f0df8..6a775e6 100644 (file)
@@ -85,7 +85,7 @@ void runEffContTaskCentralityTrain(Int_t mode = mLocal, Bool_t DATA = kFALSE) {
   //mgr->SetDebugLevel(2);
   
   //Add the centrality determination task
-  /*gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  /*gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *centralityTask = AddTaskCentrality();
   centralityTask->SetMCInput();*/ //antes for ESD
 
index 2aa40ff..55b1b3f 100644 (file)
@@ -84,7 +84,7 @@ void runEfficiencyTaskCentralityTrain(Int_t mode = mLocal, Bool_t DATA = kFALSE)
   mgr->SetDebugLevel(2);
   
   //Add the centrality determination task
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *centralityTask = AddTaskCentrality();
   centralityTask->SetMCInput();
   //centralityTask->SetPass(2);
index 9f08eb1..0bcea58 100644 (file)
@@ -89,7 +89,7 @@ void runTaskFluctuations(Int_t mode = mLocal, Bool_t DATA = kTRUE) {
     mgr->SetDebugLevel(2);
     
     //Add the centrality determination task
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
     //taskCentrality->SelectCollisionCandidates(AliVEvent::kMB);
   }
index 438029f..9858281 100644 (file)
@@ -103,7 +103,7 @@ void runTaskFluctuationsCentralityTrain(const char* runListFileName = "group4.tx
     mgr->SetDebugLevel(2);
     
     //Add the centrality determination task
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AddTaskCentrality();
     //AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
     //taskCentrality->SelectCollisionCandidates(AliVEvent::kMB);
index 10b9a72..6ce9cce 100644 (file)
@@ -185,7 +185,7 @@ void runBatch() {
   AliAnalysisTaskSE *pidresponse = AddTaskPIDResponse(kTRUE,kFALSE);
 
                                                                            
-   //gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+   //gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
    //AliCentralitySelectionTask *centrality = AddTaskCentrality();
 
   //________AddTaskFemto_______________
index fa70b41..a3ed10d 100644 (file)
@@ -55,7 +55,7 @@ void runFlowTaskCentralityKinkTrain( Int_t mode = mLocal,
   AddTaskPhysicsSelection(!DATA);
 
   //Add the centrality determination task
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask* centSelTask = AddTaskCentrality();
   if (!DATA) centSelTask->SetMCInput();
 
index 279f98e..4fb2e4c 100644 (file)
@@ -75,7 +75,7 @@ void runFlowTask(Int_t mode = mGrid,
 
   //Add the centrality determination task
   if(kUseCentrality) {
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AddTaskCentrality();
   }
 
index 9f2ba93..7332cef 100644 (file)
@@ -58,7 +58,7 @@ void runFlowTaskCentralityPIDMHTrain( Int_t mode = mLocal,
   //AddTaskPhysicsSelection(!DATA);
 
   //Add the centrality determination task
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask* centSelTask = AddTaskCentrality();
   if (!DATA) centSelTask->SetMCInput();
 
index 8d52482..069acf8 100644 (file)
@@ -55,7 +55,7 @@ void runFlowTaskCentralityPIDTrain( Int_t mode = mLocal,
   AddTaskPhysicsSelection(!DATA);
 
   //Add the centrality determination task
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask* centSelTask = AddTaskCentrality();
   if (!DATA) centSelTask->SetMCInput();
 
index 6a1ebb0..21e2ac0 100644 (file)
@@ -68,7 +68,7 @@ void runFlowTaskCentralityTrain( Int_t mode = mPROOF,
   AddTaskPhysicsSelection(!DATA);
 
   //Add the centrality determination task
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask* centSelTask = AddTaskCentrality();
   if (!DATA) centSelTask->SetMCInput();
   if (DATA) centSelTask->SetPass(1);
index 3abb198..17e6280 100644 (file)
@@ -72,7 +72,7 @@ void runFlowTaskCentralityTrain4Candidates(Int_t mode = mGridPAR, Int_t nRuns =
   AddTaskPhysicsSelection(!DATA);
 
   //Add the centrality determination task
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AddTaskCentrality();
 
   // Setup analysis per centrality bin:
index fdf40bf..af41143 100644 (file)
@@ -198,7 +198,7 @@ void runTaskFlowHigherOrdersAllPID(
     //Add the centrality determination task and the physics selection 
     // (only on ESD level, in AODs centrality is already in header and events are selected)
 //    if((!bAOD)&&(!bMCtruth)){
-//      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+//      gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
 //      AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
 
       // Add physics selection task (NOT needed for AODs)
index ef74a65..766132c 100644 (file)
@@ -48,7 +48,7 @@ void get_dedx(void){
   mgr->SetInputEventHandler(esdH);
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C");
   AddTaskPhysicsSelection(kFALSE);
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality =AddTaskCentrality();
   //  taskCentrality->SetPass(2);
 
index 06ac773..af77ca5 100644 (file)
@@ -103,7 +103,7 @@ void runTaku() {
     mgr->SetGridHandler(alienHandler);
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C");
   AddTaskPhysicsSelection(kFALSE);
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality =AddTaskCentrality();
   //taskCentrality->SetPass(2);
 
index 5105fb0..47604dc 100644 (file)
@@ -37,7 +37,7 @@ void runTakuMC() {
   physicsSelTask->GetPhysicsSelection()->SetAnalyzeMC();
 
 
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality =AddTaskCentrality();
   ///taskCentrality->SetPass(2);
   taskCentrality->SetMCInput();
index 155884f..3162f8f 100644 (file)
@@ -74,7 +74,7 @@ void runGridPbPb()
    AddTaskPIDResponse();
 
    //===== ADD CENTRALITY: ===
-   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+   gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
    AddTaskCentrality();
    
 
index ebcdbf0..9e52b14 100644 (file)
@@ -234,7 +234,7 @@ void ana(Int_t mode=mGRID)
   // Centrality
   if(kCollision=="PbPb" && kInputData=="ESD")
   {
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
   }
   
index 82e0846..f1dea3c 100644 (file)
@@ -95,7 +95,7 @@ void AddTask_GammaConvV1(TString mode){
    AliPhysicsSelectionTask* physSelTask = AddTaskPhysicsSelection(isMC);
 
    AliCentralitySelectionTask *taskCentrality;
-   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+   gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
    taskCentrality = AddTaskCentrality();
    if (isMC){
       taskCentrality->SetMCInput();
index f70132f..03c7b20 100644 (file)
@@ -61,7 +61,7 @@ void Pi0Spectrum(const char* dataset="collection.xml")
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C");
   AliPhysicsSelectionTask* physSelTask = AddTaskPhysicsSelection();
 
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality = AddTaskCentrality() ;
  // taskCentrality->SetPass(2); // remember to set the pass you are processing!!! 
 
index 3895fc9..5900bb6 100644 (file)
@@ -66,7 +66,7 @@ void PHOSPbPbQA(const char* dataset="collection.xml")
   mgr->SetDebugLevel(0);
   
   //Add centrality task!
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality = AddTaskCentrality() ;
   // taskCentrality->SetMCInput();
 
index 4895ff9..4d55e3e 100644 (file)
@@ -114,7 +114,7 @@ void Embedding(const char* dataset="collection.xml")
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C");
   AliPhysicsSelectionTask* physSelTask = AddTaskPhysicsSelection(kFALSE);
 
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality = AddTaskCentrality() ;
 
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskEventplane.C");
index 26a39a9..d38efd5 100644 (file)
@@ -80,7 +80,7 @@ void runGridPbPb()
    AddTaskPIDResponse();
 
    //===== ADD CENTRALITY: ===
-   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+   gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
    AddTaskCentrality();
 
    //===== ADD VZERO event plane: ===
index c94690b..a704b7c 100644 (file)
@@ -275,7 +275,7 @@ void SetupUtil(bool isMC, bool isAOD){
 
         //===== ADD CENTRALITY: ===
         if(!isAOD){
-                gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+                gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
                 AddTaskCentrality();
         }
 }
index 8a9c938..267d09e 100644 (file)
@@ -94,7 +94,7 @@ void AliAnalysisTaskSEVertexingHFTest()
     if(writeKineToAOD) mgr->AddTask(kinefilter);  
     // Centrality
     if(doCentrality){
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+      gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
       AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
     }
 
index f4388e1..602846f 100644 (file)
@@ -131,7 +131,7 @@ void runEMCalJetAnalysis(
 
   // Centrality task
   if (usedData == "ESD") {
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *centralityTask = AddTaskCentrality(kTRUE);
   }
 
index 6a339e1..245149b 100644 (file)
@@ -56,7 +56,7 @@ void runJetAna(
 
   // Centrality task
   if (dType == kEsd) {
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *centralityTask = AddTaskCentrality();
   }
 
index d765231..c7a7a58 100644 (file)
@@ -85,7 +85,7 @@ Bool_t AddTasksEmcalJetFilter()
   }
 
   if (bIsCentSel) {
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *taskCentSel = AddTaskCentrality(kTRUE, bIsAOD);
     if (wTriggerMask) taskCentSel->SelectCollisionCandidates(wTriggerMask);
     if (bAnaInfoMC)   taskCentSel->SetMCInput();
index 681ff0e..5da1dd0 100644 (file)
@@ -101,7 +101,7 @@ Bool_t AddTasksEmcalJetV0CF()
   }
 
   if (bIsCentSel) {
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *taskCentSel = AddTaskCentrality(kTRUE, bIsInfoAOD);
     if (wTriggerMask) taskCentSel->SelectCollisionCandidates(wTriggerMask);
     if (bAnaInfoMC)   taskCentSel->SetMCInput();
index 6430e2f..d222239 100644 (file)
@@ -86,7 +86,7 @@ Bool_t AddTasksEmcalJetV0Filter()
   }
 
   if (bIsCentSel) {
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *taskCentSel = AddTaskCentrality(kTRUE, bIsAOD);
     if (wTriggerMask) taskCentSel->SelectCollisionCandidates(wTriggerMask);
     if (bAnaInfoMC)   taskCentSel->SetMCInput();
index 3e71aed..c1bfc12 100644 (file)
@@ -42,7 +42,7 @@ Bool_t AddTasksPicoV0Filter()
   }
 
   if (bIsCentSel) {
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *taskCentSel = AddTaskCentrality(kTRUE, bIsAOD);
     if (wTriggerMask) taskCentSel->SelectCollisionCandidates(wTriggerMask);
     if (bAnaInfoMC)   taskCentSel->SetMCInput();
index 0aafa01..955049f 100644 (file)
@@ -452,7 +452,7 @@ void AnalysisTrainPWGJets(const char *analysis_mode="local",
    if(kIsPbPb&&!iAODanalysis){
 
      // has to run before AOD filter
-     gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+     gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
      AliCentralitySelectionTask *taskC = AddTaskCentrality();
       if (!taskC) ::Warning("AnalysisTrainPWG4Jets", "AliCentralitySelectionTask cannot run for this train conditions - EXCLUDED");
 
index 5ca97af..76ae9d7 100644 (file)
@@ -55,7 +55,7 @@ void simpleAODtrainJETAN(const Char_t *mode="full"){
   //AddTaskPhysicsSelection(kFALSE, kTRUE);
 
 
-  // gROOT->Macro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C"); // Only for ESD
+  // gROOT->Macro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C"); // Only for ESD
 
   gROOT->Macro("$ALICE_ROOT/ANALYSIS/macros/AddTaskEventplane.C");
 
index a76500a..1bc7beb 100644 (file)
@@ -294,6 +294,7 @@ void AddAnalysisTasks(const char *cdb_location)
   // --- Some constants ----------------------------------------------
   TString ali   = "$(ALICE_ROOT)";
   TString ana   = ali + "/ANALYSIS";
+  TString oadb  = ali + "/OADB";
   TString pwghf = ali + "/PWGHF";
   TString pwglf = ali + "/PWGLF";
   TString pwgje = ali + "/PWGJE";
@@ -336,7 +337,7 @@ void AddAnalysisTasks(const char *cdb_location)
 
   // --- Centrality (only Pb-Pb) -------------------------------------
   if (aodCfg->UseCentrality()) {
-    gROOT->LoadMacro(ana+"/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro(oadb+"/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
     taskCentrality->SetMCInput();
   }
index 3f305fd..40e1a8a 100644 (file)
@@ -222,6 +222,7 @@ void AddAnalysisTasks(const char *cdb_location)
   // --- Some short-hands --------------------------------------------
   TString ali   = "$ALICE_ROOT";
   TString ana   = ali + "/ANALYSIS";
+  TString oadb  = ali + "/OADB";
   TString pwghf = ali + "/PWGHF";
   TString pwglf = ali + "/PWGLF";
   TString pwgje = ali + "/PWGJE";
@@ -257,7 +258,7 @@ void AddAnalysisTasks(const char *cdb_location)
   }    
   // --- Centrality (A. Toia) ----------------------------------------
   if (qaCfg->DoCentrality()) {
-    gROOT->LoadMacro(ana+"/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro(oadb+"/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
     taskCentrality->SetMCInput();        
   }   
index 8c4e997..8a44634 100644 (file)
@@ -142,7 +142,7 @@ Bool_t AddAMRsnTrain(TString analysisSource = "proof", TString analysisMode = "t
       }
 
       if (useCentralityTask) {
-         gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+         gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
          AliCentralitySelectionTask *centralityTask = AddTaskCentrality(kFALSE);
       }
 
index 7a8ed58..67a331e 100644 (file)
@@ -100,7 +100,7 @@ Bool_t AddAMRsn(TString analysisSource = "proof", TString analysisMode = "test",
    }
 
    if (useCentralityTask) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+      gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
       AliCentralitySelectionTask *centralityTask = AddTaskCentrality(kFALSE);
    }
 
index a55bff2..fb90191 100644 (file)
@@ -144,7 +144,7 @@ TString Setup
    //
    if (isESD && !isPP) {
      ::Info("AnalysisSetup", "Add centrality and event plane computation tasks");
-      gROOT->LoadMacro("$(ALICE_ROOT)/ANALYSIS/macros/AddTaskCentrality.C");
+      gROOT->LoadMacro("$(ALICE_ROOT)/OADB/macros/AddTaskCentrality.C");
       gROOT->LoadMacro("$(ALICE_ROOT)/ANALYSIS/macros/AddTaskEventplane.C");
       AliCentralitySelectionTask* taskCentrality = (AliCentralitySelectionTask*)AddTaskCentrality();
       if (isMC) {
index c578697..a23e7a5 100644 (file)
@@ -145,7 +145,7 @@ TString Setup
    //
    if (isESD && !isPP) {
      ::Info("AnalysisSetup", "Add centrality and event plane computation tasks");
-      gROOT->LoadMacro("$(ALICE_ROOT)/ANALYSIS/macros/AddTaskCentrality.C");
+      gROOT->LoadMacro("$(ALICE_ROOT)/OADB/macros/AddTaskCentrality.C");
       gROOT->LoadMacro("$(ALICE_ROOT)/ANALYSIS/macros/AddTaskEventplane.C");
       AliCentralitySelectionTask* taskCentrality = (AliCentralitySelectionTask*)AddTaskCentrality();
       if (isMC) {
index 30c2fd8..3d56ecd 100644 (file)
@@ -132,7 +132,7 @@ TString Setup
 
    if (isESD && !(collSyst==kPP) ) {
      ::Info("AnalysisSetup", "Add centrality and event plane computation tasks");
-      gROOT->LoadMacro("$(ALICE_ROOT)/ANALYSIS/macros/AddTaskCentrality.C");
+      gROOT->LoadMacro("$(ALICE_ROOT)/OADB/macros/AddTaskCentrality.C");
       gROOT->LoadMacro("$(ALICE_ROOT)/ANALYSIS/macros/AddTaskEventplane.C");
       AliCentralitySelectionTask* taskCentrality = (AliCentralitySelectionTask*)AddTaskCentrality();
       if (isMC) {
index bda933e..1b8a405 100644 (file)
@@ -121,7 +121,7 @@ void run(Char_t* data, Long64_t nev = -1, Long64_t offset = 0, Bool_t debug = kF
 
 
   // Centrality
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentr = AddTaskCentrality();
   // OBSOLETE
   const char * file1 = "$ALICE_ROOT/ANALYSIS/macros/test_AliCentralityBy1D.root";
index 2aed3a0..fd23fac 100644 (file)
@@ -415,7 +415,7 @@ void runAAF(Int_t nFilesMax, char* type, char* textFileName, Int_t task)
 
   if(esdAna && runtype==2) { // only for ESD and PbPb
 
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *taskCentrality = AddTaskCentrality(); 
     //taskCentrality->SetPass(2);
     if (analysisMC)
@@ -620,7 +620,7 @@ TChain* CreateChainLocal(Int_t nFilesMax, char* filename, char* treeName)
   AliAnalysisManager* mgr = new AliAnalysisManager("PID histos", "testing analysis");
   AliESDInputHandler *esdHandler = new AliESDInputHandler();
   mgr->SetInputEventHandler(esdHandler);
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality = AddTaskCentrality(); 
 
   // ######### PID task ###############
index 518fee3..fefaf99 100644 (file)
@@ -66,7 +66,7 @@ void runLocalExample(const TString& dir="./")
        // Centrality selection
        if(kHeavyIons)
        {
-               gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+               gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
                AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
        }
        
index 2261d5e..75d45b0 100644 (file)
@@ -64,7 +64,7 @@ SteerAnalysisTaskParticleEfficiency(const Char_t *inputfilename, Int_t maxFiles
   /* add tasks */
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C");
   AliPhysicsSelectionTask* physSelTask = AddTaskPhysicsSelection(kTRUE);
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *centralityTask = AddTaskCentrality(); 
   centralityTask->SetMCInput();
   gROOT->LoadMacro("AddAnalysisTaskParticleEfficiency.C");
index 92e5ae0..43091e5 100644 (file)
@@ -70,7 +70,7 @@ SteerAnalysisTaskTOFSpectraPbPb(const Char_t *inputfilename, Bool_t mcFlag = kFA
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C");
   AliPhysicsSelectionTask* physSelTask = AddTaskPhysicsSelection(mcFlag);
   if (pbpbFlag) {
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *centralityTask = AddTaskCentrality(); 
     //    centralityTask->SetPass(2);
     if (mcFlag) centralityTask->SetMCInput();
index efb1bd6..2a9d160 100644 (file)
@@ -105,7 +105,7 @@ SteerAnalysisTaskTOFSpectraPbPb(const Char_t *inputfilename, Bool_t mcFlag = kFA
   //  physSelTask->GetPhysicsSelection()->SetCustomOADBObjects(oadb,0);
 
  if (pbpbFlag) {
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *centralityTask = AddTaskCentrality(); 
     //    centralityTask->SetPass(2);
     if (mcFlag) centralityTask->SetMCInput();
index 4f1f9c4..54c4d95 100644 (file)
@@ -80,7 +80,7 @@ void runGridCascadePbPb( Bool_t   useMC               = kTRUE,  // kTRUE if anal
     gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C");
     AliPhysicsSelectionTask *physSel = AddTaskPhysicsSelection(useMC);
     // Centrality selection
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *taskCentr = AddTaskCentrality();
     if (useMC){
       taskCentr->SetMCInput();
index 2316046..94ab5ea 100644 (file)
@@ -84,7 +84,7 @@ void Analysis(TString dataset, TString outFileMC, TString outFileData,
     AliPhysicsSelectionTask* physSelTask = AddTaskPhysicsSelection(useMC);
 
     // centrality selection
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *taskCentr = AddTaskCentrality();
     if (useMC) {
       taskCentr->SetMCInput();
index 9ba97b0..88571a5 100644 (file)
@@ -79,7 +79,7 @@ void run(const char * data, const char * passOrPath, Long64_t nev = -1, Long64_t
   AliPhysicsSelectionTask * physicsSelectionTask = AddTaskPhysicsSelection(isMC,kTRUE,0);
 
   // Centrality
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
   //taskCentrality->SetPass(2);
   if(isMC) taskCentrality->SetMCInput();
index 7c9aa68..97ed3fd 100644 (file)
@@ -74,7 +74,7 @@ void run(const char * data, const char * passOrPath, Long64_t nev = -1, Long64_t
   AliPhysicsSelectionTask * physicsSelectionTask = AddTaskPhysicsSelection(isMC);
 
   // Centrality
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
   taskCentrality->SetPass(2);
   if(isMC) taskCentrality->SetMCInput();
index d74b753..bb1394c 100644 (file)
@@ -76,7 +76,7 @@ void run(const char * data, const char * passOrPath, Long64_t nev = -1, Long64_t
   AliPhysicsSelectionTask * physicsSelectionTask = AddTaskPhysicsSelection(isMC,kTRUE,0);
 
   // Centrality
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
   //taskCentrality->SetPass(2);
   if(isMC) taskCentrality->SetMCInput();
index 6f2e79b..3692f41 100644 (file)
@@ -79,7 +79,7 @@ void runAOD(const char * data, const char * passOrPath, Long64_t nev = -1, Long6
   //  AliPhysicsSelectionTask * physicsSelectionTask = AddTaskPhysicsSelection(isMC,kFALSE,0);
   if(!physicsSelectionTask ) { Printf("no physSelTask"); return; }
 
-  /*  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  /*  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
   //taskCentrality->SetPass(2);                                                                                                                                                                               i
   if(isMC) taskCentrality->SetMCInput();
@@ -90,7 +90,7 @@ void runAOD(const char * data, const char * passOrPath, Long64_t nev = -1, Long6
   if(!PIDTask ) { Printf("no physSelTask"); return; }
 
   /*  // Centrality
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
   //taskCentrality->SetPass(2);
   if(isMC) taskCentrality->SetMCInput();
index 379ec17..692a89a 100644 (file)
@@ -79,7 +79,7 @@ void runLK0Spectra(const char * data, const char * passOrPath, Long64_t nev = -1
   AliPhysicsSelectionTask * physicsSelectionTask = AddTaskPhysicsSelection(isMC,kTRUE,0);
 
   // Centrality
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
   //taskCentrality->SetPass(2);
   if(isMC) taskCentrality->SetMCInput();
index 7c9aa68..97ed3fd 100644 (file)
@@ -74,7 +74,7 @@ void run(const char * data, const char * passOrPath, Long64_t nev = -1, Long64_t
   AliPhysicsSelectionTask * physicsSelectionTask = AddTaskPhysicsSelection(isMC);
 
   // Centrality
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
   taskCentrality->SetPass(2);
   if(isMC) taskCentrality->SetMCInput();
index c43246d..9c83e29 100644 (file)
@@ -370,7 +370,7 @@ void runCaloEt(bool submit = false, // true or false
   AliPhysicsSelectionTask *physicsSelectionTask = AddTaskPhysicsSelection(isMc);//isMC is true when processing monte carlo
   if(isPb){     
     cout<<"Adding centrality selection task"<<endl;
-    gROOT->ProcessLine(".L $ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+    gROOT->ProcessLine(".L $ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     //gROOT->ProcessLine(".L AliCentralitySelectionTask.cxx++g");
     AliCentralitySelectionTask *centTask = AddTaskCentrality();
     if(isMc){
index 2a59525..af2d015 100644 (file)
@@ -124,7 +124,7 @@ void runHadEt(bool submit = false, bool data = false, Int_t dataset = 20100, Int
 
   cerr<<"Hello I am here 108"<<endl;
 
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
 
   AliCentralitySelectionTask *centTask;
   
index 51c5bbc..4b17426 100644 (file)
@@ -209,7 +209,7 @@ void AddAnalysisTasks(const char *suffix)
         printf("Disabling centrality task for p-p\n");
         doCentrality = kFALSE;
      } else {           
-        gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+        gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
         AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
      }   
   }   
index 58d904c..653d3f3 100644 (file)
@@ -485,7 +485,7 @@ AliAnalysisTaskMuonResolution* CreateAnalysisTrain(Int_t mode, Int_t iStep, Bool
   }
   
   // centrality selection
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   if (!gROOT->ProcessLineFast("AddTaskCentrality()")) {
     Error("CreateAnalysisTrain","AliCentralitySelectionTask not created!");
     return 0x0;
index 7d96c23..bb492b8 100644 (file)
@@ -223,7 +223,7 @@ void AddAnalysisTasks()
         printf("Disabling centrality task for p-p\n");
         doCentrality = kFALSE;
      } else {           
-        gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+        gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
         AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
      }   
   }   
index a5e4514..982e106 100644 (file)
@@ -56,7 +56,7 @@ void runAnaEPFlatenningProof(Int_t mode = 0, const char *folder = "/alice/data",
     AliPhysicsSelectionTask *physicsSelectionTask = AddTaskPhysicsSelection(kFALSE);
   }
 
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
 
   // Create task
index 54e5466..b666f2c 100644 (file)
@@ -133,7 +133,7 @@ void runAnaTrigProof(Int_t mode = 0, const char *folder = "/alice/data",
     physicsSelectionTask->GetPhysicsSelection()->SetCustomOADBObjects(oadbDefaultPbPb,0,0); 
   }
 
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
 
   // Create task
index 89ce5d0..31deea4 100755 (executable)
@@ -82,7 +82,7 @@ void MyAnalysisMacroTrackletMulti
   gProof->Load("AliTrackletTaskMulti.cxx++");
   //
   printf("Loading Centrality task\n");
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
   AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();
   //  taskCentrality->SetDebugLevel(2);
   if (useMC) taskCentrality->SetMCInput();
index afb1a4a..0471e8f 100644 (file)
@@ -35,7 +35,7 @@
   
   Bool_t isMC=false;
   
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
+  gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskCentrality.C");
     AliCentralitySelectionTask *taskCentrality = AddTaskCentrality();