Split: fixed paths to Tender*, EventMixing
authordberzano <dario.berzano@cern.ch>
Fri, 16 Jan 2015 11:46:34 +0000 (12:46 +0100)
committerdberzano <dario.berzano@cern.ch>
Sun, 18 Jan 2015 23:01:06 +0000 (00:01 +0100)
Global substitution with sed

40 files changed:
ANALYSIS/Makefile
ANALYSIS/macros/AODtrain.C
ANALYSIS/macros/AODtrainsim.C
ANALYSIS/macros/AnalysisTrainFilterMC.C
ANALYSIS/macros/AnalysisTrainNew.C
ANALYSIS/macros/AnalysisTrainNewFilterAOD.C
ANALYSIS/macros/AnalysisTrainNewFilterAODMC.C
ANALYSIS/macros/TaskBuzzer.C
ANALYSIS/macros/runProofNormalization.C
MFT/AODtrain.C
PWG/EMCAL/CMakeLists.txt
PWG/mftmuondep/charmonium/CMakeLists.txt
PWG/muondep/AccEffTemplates/AODtrainsim.C
PWGCF/EBYE/CMakeLists.txt
PWGDQ/dielectron/macrosLMEE/testing/CreateAlienHandlerPbPb.C
PWGGA/PHOSTasks/CMakeLists.txt
PWGHF/centraltrain/AnalysisTrainPWG3.C
PWGHF/centraltrain/AnalysisTrainPWG3AOD.C
PWGHF/hfe/macros/test/CreateAlienHandlerPbPb.C
PWGHF/hfe/macros/test/CreateAlienHandlerpPb.C
PWGHF/hfe/macros/test/runGridpPb.C
PWGJE/macros/AnalysisTrainPWGJets.C
PWGLF/FORWARD/trains/AODTrain.C
PWGLF/RESONANCES/CMakeLists.txt
PWGLF/RESONANCES/macros/lego_train/old/AddAnalysisTaskMixInfo.C
PWGLF/RESONANCES/macros/mini/AnalysisSetupRsnMini.C
PWGLF/SPECTRA/ChargedHadrons/dNdPt/macros/ApplyCorrections.C
PWGLF/SPECTRA/ChargedHadrons/dNdPt/macros/ApplyCorrections_PbPb.C
PWGLF/SPECTRA/ChargedHadrons/dNdPt/macros/ApplyCorrections_pp.C
PWGLF/SPECTRA/ChargedHadrons/dNdPt/macros/GenerateCorrMatr.C
PWGLF/SPECTRA/ChargedHadrons/dNdPt/macros/GenerateCorrMatr_PbPb.C
PWGLF/SPECTRA/ChargedHadrons/multPbPb/runTriggerStudy.C
PWGLF/SPECTRA/PiKaPr/TOF/pPb502/task/SteerAnalysisTaskTOFSpectraPbPb.C
PWGLF/STRANGENESS/CMakeLists.txt
PWGPP/CMakeLists.txt
PWGUD/DIFFRACTIVE/QA/AddTaskCPQA.C
PWGUD/multVScentPbPb/AliTrackletTaskMulti.cxx
PWGUD/multVScentPbPb/AliTrackletTaskMultipp.cxx
PWGUD/multVScentPbPb/AliTrackletTaskUni.cxx
TENDER/TenderSupplies/CMakeLists.txt

index fd1baa0..6476299 100644 (file)
@@ -35,7 +35,7 @@ endif
 # only if no par file was loaded before
 #ifeq ($(ALICEINC),-I.)
   ifneq ($(ALICE_ROOT),)
-    ALICEINC += -I$(ALICE_ROOT)/include -I$(ALICE_ROOT)/ANALYSIS/Tender -I$(ALICE_ROOT)/TOF -I$(ALICE_ROOT)/TRD/Cal -I$(ALICE_ROOT)/VZERO -I$(ALICE_ROOT)/TPC -I$(ALICE_ROOT)/T0 -I$(ALICE_ROOT)/EMCAL
+    ALICEINC += -I$(ALICE_ROOT)/include -I$(ALICE_ROOT)/TENDER/Tender -I$(ALICE_ROOT)/TOF -I$(ALICE_ROOT)/TRD/Cal -I$(ALICE_ROOT)/VZERO -I$(ALICE_ROOT)/TPC -I$(ALICE_ROOT)/T0 -I$(ALICE_ROOT)/EMCAL
   endif
 #endif
 
index 49fbd16..13ecd40 100644 (file)
@@ -149,7 +149,7 @@ void AddAnalysisTasks(const char *cdb_location){
   //
    AliAnalysisManager::SetCommonFileName("AODQA.root");
    if (useTender) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+      gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
       // IF V0 tender needed, put kTRUE below
       AliAnalysisTaskSE *tender = AddTaskTender(useV0tender);
 //      tender->SetDebugLevel(2);
index a66b045..17b5c41 100644 (file)
@@ -167,7 +167,7 @@ void AddAnalysisTasks(const char *cdb_location){
 //    taskCDB->SetRunNumber(run_number);
   }    
    if (useTender) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+      gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
       // IF V0 tender needed, put kTRUE below
       AliAnalysisTaskSE *tender = AddTaskTender(useV0tender);
 //      tender->SetDebugLevel(2);
index 8521372..30a72e9 100644 (file)
@@ -375,7 +375,7 @@ void AddAnalysisTasks(){
   // Tender and supplies. Needs to be called for every event.
   //
    if (useTender) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+      gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
       // IF V0 tender needed, put kTRUE below
       AliAnalysisTaskSE *tender = AddTaskTender(useV0tender);
 //      tender->SetDebugLevel(2);
index ea13e80..a657fb8 100644 (file)
@@ -347,7 +347,7 @@ void AddAnalysisTasks()
   // Tender and supplies
   //
    if (useTender) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+      gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
       AliAnalysisTaskSE *tender = AddTaskTender(kTRUE);
 //      tender->SelectCollisionCandidates();
       tender->SetDebugLevel(2);
index 41eb3c5..1d525de 100644 (file)
@@ -360,7 +360,7 @@ void AddAnalysisTasks()
   // Tender and supplies. Needs to be called for every event.
   //
    if (useTender) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+      gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
       // IF V0 tender needed, put kTRUE below
       AliAnalysisTaskSE *tender = AddTaskTender(useV0tender);
 //      tender->SetDebugLevel(2);
index eb1e7b4..66ea8c3 100644 (file)
@@ -358,7 +358,7 @@ void AddAnalysisTasks()
   // Tender and supplies. Needs to be called for every event.
   //
    if (useTender) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+      gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
       AliAnalysisTaskSE *tender = AddTaskTender(kTRUE);
 //      tender->SelectCollisionCandidates();
       tender->SetDebugLevel(2);
index 54ae561..01cd8e2 100644 (file)
@@ -86,7 +86,7 @@ void AddAnalysisTasks(UInt_t config)
   // Tender and supplies
   //
   if (config & kTender) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+      gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
       AliAnalysisTaskSE *tender = AddTaskTender();
       // SelectCollisionCandidates ?? Tender has to derive from TaskSE
       tender->SelectCollisionCandidates();
index 54574cf..02d7ebd 100644 (file)
@@ -73,7 +73,7 @@ void runProofNormalization(const char * dataset = "LHC09b12_7TeV_0.5T", TString
   //____________________________________________//
 
 #ifdef TENDER
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+  gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
   AliAnalysisTask* tender=0x0;
   if(!isMC)
     {
index 1d13938..fe369f8 100644 (file)
@@ -146,7 +146,7 @@ void AddAnalysisTasks(Int_t merge, const char *cdb_location){
   //
    AliAnalysisManager::SetCommonFileName("AODQA.root");
    if (useTender) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+      gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
       // IF V0 tender needed, put kTRUE below
       AliAnalysisTaskSE *tender = AddTaskTender(useV0tender);
 //      tender->SetDebugLevel(2);
index ef3af8e..2997628 100644 (file)
@@ -23,8 +23,8 @@ include_directories(${AliRoot_SOURCE_DIR}/PWG/EMCAL)
 include_directories(${ROOT_INCLUDE_DIRS}
                     ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
                     ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice
-                    ${AliRoot_SOURCE_DIR}/ANALYSIS/Tender
-                    ${AliRoot_SOURCE_DIR}/ANALYSIS/TenderSupplies
+                    ${AliRoot_SOURCE_DIR}/TENDER/Tender
+                    ${AliRoot_SOURCE_DIR}/TENDER/TenderSupplies
                     ${AliRoot_SOURCE_DIR}/EMCAL/EMCALbase
                     ${AliRoot_SOURCE_DIR}/EMCAL/EMCALrec
                     ${AliRoot_SOURCE_DIR}/EMCAL/EMCALUtils
index 10ea92f..4753c2c 100644 (file)
@@ -22,7 +22,7 @@ include_directories(${AliRoot_SOURCE_DIR}/PWG/mftmuondep/charmonium)
 # Aditional include directories in alphabetical order
 include_directories(${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
                     ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice
-                    ${AliRoot_SOURCE_DIR}/ANALYSIS/EventMixing
+                    ${AliRoot_SOURCE_DIR}/EVENTMIX
                     ${AliRoot_SOURCE_DIR}/MFT/MFTbase
                     ${AliRoot_SOURCE_DIR}/MUON/MUONrec
                     ${AliRoot_SOURCE_DIR}/STEER/AOD
@@ -46,7 +46,7 @@ generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")
 # Seach any Root class you use inside the ROOT rootmaps and add Root library to the dependency
 # AliRoot classes are usually located in the name of the include
 # Ex: ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS -> ANALYSIS
-#     ${AliRoot_SOURCE_DIR}/ANALYSIS/EventMixing - EventMixing
+#     ${AliRoot_SOURCE_DIR}/EVENTMIX - EventMixing
 set(ROOT_DEPENDENCIES Core EG Hist MathCore)
 set(ALIROOT_DEPENDENCIES STEERBase AOD ANALYSIS ANALYSISalice EventMixing MUONrec MFTbase)
 
index 6080062..9b7abc4 100644 (file)
@@ -148,7 +148,7 @@ void AddAnalysisTasks(Int_t merge){
   //
   //AliAnalysisManager::SetCommonFileName("AODQA.root");
   if (useTender) {
-    gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+    gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
     // IF V0 tender needed, put kTRUE below
     AliAnalysisTaskSE *tender = AddTaskTender(useV0tender);
     //      tender->SetDebugLevel(2);
index 7c58e43..23e607d 100644 (file)
@@ -23,7 +23,7 @@ include_directories(${AliRoot_SOURCE_DIR}/PWGCF/EBYE)
 include_directories(${ROOT_INCLUDE_DIRS}
                     ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
                     ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice
-                    ${AliRoot_SOURCE_DIR}/ANALYSIS/EventMixing
+                    ${AliRoot_SOURCE_DIR}/EVENTMIX
                     ${AliRoot_SOURCE_DIR}/CORRFW
                     ${AliRoot_SOURCE_DIR}/PWG/Tools
                     ${AliRoot_SOURCE_DIR}/PWGCF/EBYE/LRC
index 9b15b10..6601388 100644 (file)
@@ -58,7 +58,7 @@ plugin->AddRunNumber(170040);
 // Declare the analysis source files names separated by blancs. To be compiled runtime
 // using ACLiC on the worker nodes.
 //   plugin->SetAnalysisSource("AliAnalysisHelperJetTasks.cxx AliAnalysisTaskPartonDisc.cxx");
-   plugin->AddIncludePath("-I. .I$ALIEN_ROOT/api/lib -I$ROOTSYS/lib -I$ROOTSYS/include -I$ALICE_ROOT/include -I$ALICE_ROOT/PWGDQ/ -I$ALICE_ROOT/PWGDQ/dielectron/macrosLMEE -I$ALICE_ROOT/PWGDQ/dielectron -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/ANALYSIS/Tender -I$ALICE_ROOT/ANALYSIS/TenderSupplies");
+   plugin->AddIncludePath("-I. .I$ALIEN_ROOT/api/lib -I$ROOTSYS/lib -I$ROOTSYS/include -I$ALICE_ROOT/include -I$ALICE_ROOT/PWGDQ/ -I$ALICE_ROOT/PWGDQ/dielectron/macrosLMEE -I$ALICE_ROOT/PWGDQ/dielectron -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/TENDER/Tender -I$ALICE_ROOT/TENDER/TenderSupplies");
  //  plugin->SetAdditionalLibs("libGui.so libXMLParser.so libSTEERBase.so libESD.so libAOD.so libCDB.so libANALYSIS.so libANALYSISalice.so libCORRFW.so libTender.so libProof.so libRAWDatabase.so libSTEER.so libTOFbase.so libPWGDQdielectron.so");// ConfigLowMassDiE.C")
    plugin->SetAdditionalLibs("libGui.so libXMLParser.so libSTEERBase.so libESD.so libAOD.so libCDB.so libANALYSIS.so libANALYSISalice.so libCORRFW.so libTender.so libProof.so libRAWDatabase.so libSTEER.so libTOFbase.so libPWGDQdielectron.so ConfigLowMassDiE.C");
    
index fd43820..0d96a1a 100644 (file)
@@ -37,8 +37,8 @@ include_directories(${AliRoot_SOURCE_DIR}/PWGGA/PHOSTasks
 include_directories(${ROOT_INCLUDE_DIRS}
                     ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
                     ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice
-                    ${AliRoot_SOURCE_DIR}/ANALYSIS/Tender
-                    ${AliRoot_SOURCE_DIR}/ANALYSIS/TenderSupplies
+                    ${AliRoot_SOURCE_DIR}/TENDER/Tender
+                    ${AliRoot_SOURCE_DIR}/TENDER/TenderSupplies
                     ${AliRoot_SOURCE_DIR}/EMCAL/EMCALUtils
                     ${AliRoot_SOURCE_DIR}/PHOS/PHOSbase
                     ${AliRoot_SOURCE_DIR}/PHOS/PHOSrec
index 2ac4919..8533b8d 100644 (file)
@@ -262,7 +262,7 @@ void AddAnalysisTasks()
   // Tender and supplies. Needs to be called for every event.
   //
    if (useTender) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+      gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
       // IF V0 tender needed, put kTRUE below
       AliAnalysisTaskSE *tender = AddTaskTender(useV0tender);
 //      tender->SetDebugLevel(2);
index edbaa32..bbb1862 100644 (file)
@@ -263,7 +263,7 @@ void AddAnalysisTasks()
   // Tender and supplies. Needs to be called for every event.
   //
    if (useTender) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+      gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
       // IF V0 tender needed, put kTRUE below
       AliAnalysisTaskSE *tender = AddTaskTender(useV0tender);
 //      tender->SetDebugLevel(2);
index d369299..cb3dc20 100644 (file)
@@ -58,7 +58,7 @@ plugin->AddRunNumber(170040);
 // Declare the analysis source files names separated by blancs. To be compiled runtime
 // using ACLiC on the worker nodes.
 //   plugin->SetAnalysisSource("AliAnalysisHelperJetTasks.cxx AliAnalysisTaskPartonDisc.cxx");
-   plugin->AddIncludePath("-I. .I$ALIEN_ROOT/api/lib -I$ROOTSYS/lib -I$ROOTSYS/include -I$ALICE_ROOT/include -I$ALICE_ROOT/PWGHF/ -I$ALICE_ROOT/PWGHF/hfe/macros -I$ALICE_ROOT/PWGHF/hfe -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/ANALYSIS/Tender -I$ALICE_ROOT/ANALYSIS/TenderSupplies -I$ALICE_ROOT/PWG/ -I$ALICE_ROOT/PWG/FLOW -I$ALICE_ROOT/PWG/Base -I$ALICE_ROOT/PWG/Tasks");
+   plugin->AddIncludePath("-I. .I$ALIEN_ROOT/api/lib -I$ROOTSYS/lib -I$ROOTSYS/include -I$ALICE_ROOT/include -I$ALICE_ROOT/PWGHF/ -I$ALICE_ROOT/PWGHF/hfe/macros -I$ALICE_ROOT/PWGHF/hfe -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/TENDER/Tender -I$ALICE_ROOT/TENDER/TenderSupplies -I$ALICE_ROOT/PWG/ -I$ALICE_ROOT/PWG/FLOW -I$ALICE_ROOT/PWG/Base -I$ALICE_ROOT/PWG/Tasks");
  //  plugin->SetAdditionalLibs("libGui.so  libXMLParser.so libSTEERBase.so libESD.so libAOD.so libCDB.so libANALYSIS.so libANALYSISalice.so libCORRFW.so  libTender.so libProof.so libRAWDatabase.so libSTEER.so libTOFbase.so libPWGDQdielectron.so");// ConfigLowMassDiE.C")
    plugin->SetAdditionalLibs("libGui.so  libXMLParser.so libSTEERBase.so libESD.so libAOD.so libCDB.so libANALYSIS.so libANALYSISalice.so libCORRFW.so  libPWGflowBase.so libPWGflowTasks.so libPWGHFhfe.so libTender.so libProof.so libRAWDatabase.so libSTEER.so libTOFbase.so");
    
index 0c31494..b7e4e50 100644 (file)
@@ -61,7 +61,7 @@ plugin->AddRunNumber(195351);
 // Declare the analysis source files names separated by blancs. To be compiled runtime
 // using ACLiC on the worker nodes.
 //   plugin->SetAnalysisSource("AliAnalysisHelperJetTasks.cxx AliAnalysisTaskPartonDisc.cxx");
-   plugin->AddIncludePath("-I. .I$ALIEN_ROOT/api/lib -I$ROOTSYS/lib -I$ROOTSYS/include -I$ALICE_ROOT/include -I$ALICE_ROOT/PWGHF/ -I$ALICE_ROOT/PWGHF/hfe/macros -I$ALICE_ROOT/PWGHF/hfe -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/ANALYSIS/Tender -I$ALICE_ROOT/ANALYSIS/TenderSupplies -I$ALICE_ROOT/PWG/ -I$ALICE_ROOT/PWG/FLOW -I$ALICE_ROOT/PWG/Base -I$ALICE_ROOT/PWG/Tasks");
+   plugin->AddIncludePath("-I. .I$ALIEN_ROOT/api/lib -I$ROOTSYS/lib -I$ROOTSYS/include -I$ALICE_ROOT/include -I$ALICE_ROOT/PWGHF/ -I$ALICE_ROOT/PWGHF/hfe/macros -I$ALICE_ROOT/PWGHF/hfe -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/TENDER/Tender -I$ALICE_ROOT/TENDER/TenderSupplies -I$ALICE_ROOT/PWG/ -I$ALICE_ROOT/PWG/FLOW -I$ALICE_ROOT/PWG/Base -I$ALICE_ROOT/PWG/Tasks");
  //  plugin->SetAdditionalLibs("libGui.so  libXMLParser.so libSTEERBase.so libESD.so libAOD.so libCDB.so libANALYSIS.so libANALYSISalice.so libCORRFW.so  libTender.so libProof.so libRAWDatabase.so libSTEER.so libTOFbase.so libPWGDQdielectron.so");// ConfigLowMassDiE.C")
    plugin->SetAdditionalLibs("libGui.so  libXMLParser.so libSTEERBase.so libESD.so libAOD.so libCDB.so libANALYSIS.so libANALYSISalice.so libCORRFW.so  libPWGflowBase.so libPWGflowTasks.so libPWGHFhfe.so libTender.so libProof.so libRAWDatabase.so libSTEER.so libTOFbase.so");
    
index 688dc1e..c94690b 100644 (file)
@@ -27,7 +27,7 @@ AliAnalysisAlien *CreateGridHandler(){
         plugin->SetAliROOTVersion(g_aliroot_version.Data());
 
         plugin->SetOutputToRunNo();
-        plugin->AddIncludePath("-I. .I$ALIEN_ROOT/api/lib -I$ROOTSYS/lib -I$ROOTSYS/include -I$ALICE_ROOT/include -I$ALICE_ROOT/PWGHF/ -I$ALICE_ROOT/PWGHF/hfe/macros -I$ALICE_ROOT/PWGHF/hfe -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/ANALYSIS/Tender -I$ALICE_ROOT/ANALYSIS/TenderSupplies -I$ALICE_ROOT/PWG/ -I$ALICE_ROOT/PWG/FLOW -I$ALICE_ROOT/PWG/Base -I$ALICE_ROOT/PWG/Tasks");
+        plugin->AddIncludePath("-I. .I$ALIEN_ROOT/api/lib -I$ROOTSYS/lib -I$ROOTSYS/include -I$ALICE_ROOT/include -I$ALICE_ROOT/PWGHF/ -I$ALICE_ROOT/PWGHF/hfe/macros -I$ALICE_ROOT/PWGHF/hfe -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/TENDER/Tender -I$ALICE_ROOT/TENDER/TenderSupplies -I$ALICE_ROOT/PWG/ -I$ALICE_ROOT/PWG/FLOW -I$ALICE_ROOT/PWG/Base -I$ALICE_ROOT/PWG/Tasks");
         plugin->SetAdditionalLibs("libGui.so  libXMLParser.so libSTEERBase.so libESD.so libAOD.so libCDB.so libANALYSIS.so libANALYSISalice.so libCORRFW.so  libPWGflowBase.so libPWGflowTasks.so libPWGHFhfe.so libTender.so libProof.so libRAWDatabase.so libSTEER.so libTOFbase.so libPWGTRD.so");
    
         plugin->SetDefaultOutputs(kFALSE);
@@ -263,7 +263,7 @@ void SetupUtil(bool isMC, bool isAOD){
 
         //==== Add tender ====
         if(!isAOD){
-                gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+                gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
                 //AddTaskTender();
         }
 
index d0b61d6..0aafa01 100644 (file)
@@ -414,7 +414,7 @@ void AnalysisTrainPWGJets(const char *analysis_mode="local",
    //                                                                                                                              
 
    if (useTender) {
-      gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+      gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
       AliAnalysisTaskSE *tender = AddTaskTender(kTRUE);
       //      tender->SelectCollisionCandidates();                                                                                      
       tender->SetDebugLevel(2);
index 5bf6210..81d0204 100644 (file)
@@ -96,7 +96,7 @@ public:
 
     AliAnalysisManager::SetCommonFileName("AODQA.root");
     if (tender) 
-      CoupleCar("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C",
+      CoupleCar("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C",
              Form("%d", fOptions.Has("v0-tender")));
     
     if (fOptions.Has("pid-response")) 
index c060583..13205a8 100644 (file)
@@ -23,7 +23,7 @@ include_directories(${AliRoot_SOURCE_DIR}/PWGLF/RESONANCES)
 include_directories(${ROOT_INCLUDE_DIRS}
                     ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
                     ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice
-                    ${AliRoot_SOURCE_DIR}/ANALYSIS/EventMixing
+                    ${AliRoot_SOURCE_DIR}/EVENTMIX
                     ${AliRoot_SOURCE_DIR}/CORRFW
                     ${AliRoot_SOURCE_DIR}/STEER/AOD
                     ${AliRoot_SOURCE_DIR}/STEER/ESD
index 7e597a5..4ff3b11 100644 (file)
@@ -1,6 +1,6 @@
 #ifndef __CINT__
 #include <ANALYSIS/AliAnalysisManager.h>
-#include <ANALYSIS/EventMixing/AliAnalysisTaskMixInfo.h>
+#include <EVENTMIX/AliAnalysisTaskMixInfo.h>
 #include <ANALYSIS/AliAnalysisDataContainer.h>
 #endif
 void AddAnalysisTaskMixInfo(TString opts = "")
index 29115a8..c578697 100644 (file)
@@ -121,7 +121,7 @@ TString Setup
       ::Info("AnalysisSetup", "Adding tender (and then accepting V0 info)", options);
 //      gROOT->LoadMacro(Form("%s/AddTaskTender.C", macroPath)); //for developers usage
 //      gROOT->LoadMacro(Form("$(ALICE_ROOT)/PWGLF/RESONANCES/macros/mini/AddTaskTender.C")); //deprecated
-      gROOT->LoadMacro(Form("$(ALICE_ROOT)/ANALYSIS/TenderSupplies/AddTaskTender.C"));
+      gROOT->LoadMacro(Form("$(ALICE_ROOT)/TENDER/TenderSupplies/AddTaskTender.C"));
       AddTaskTender();
       noV0 = kFALSE;
    }
index 6848f13..6ac3738 100644 (file)
@@ -18,7 +18,7 @@ Double_t ApplyCorrections(const char* datafile, const char* datatask, const char
     
     //load required libraries
     //load required libraries    
-    gSystem->AddIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/ -I$ALICE_ROOT/include -I$ALICE_ROOT/STEER  -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/PWG0 -I$ALICE_ROOT/PWGPP -I$ALICE_ROOT/PWG2 -I$ALICE_ROOT/PWG3 -I$ALICE_ROOT/PWG3/vertexingHF -I$ALICE_ROOT/PWG4 -I$ALICE_ROOT/CORRFW -I$ALICE_ROOT/TPC -I$ALICE_ROOT/TRD -I$ALICE_ROOT/PWG3/muon -I$ALICE_ROOT/JETAN -I$ALICE_ROOT/ANALYSIS/Tender");
+    gSystem->AddIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/ -I$ALICE_ROOT/include -I$ALICE_ROOT/STEER  -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/PWG0 -I$ALICE_ROOT/PWGPP -I$ALICE_ROOT/PWG2 -I$ALICE_ROOT/PWG3 -I$ALICE_ROOT/PWG3/vertexingHF -I$ALICE_ROOT/PWG4 -I$ALICE_ROOT/CORRFW -I$ALICE_ROOT/TPC -I$ALICE_ROOT/TRD -I$ALICE_ROOT/PWG3/muon -I$ALICE_ROOT/JETAN -I$ALICE_ROOT/TENDER/Tender");
     
   gSystem->Load("libCore");
   gSystem->Load("libPhysics");
index f75d21e..2d60f8a 100644 (file)
@@ -35,7 +35,7 @@ if ( id.Contains("c90-100") ) { c_first = c_last = 11; }
     
     //load required libraries
     //load required libraries    
-    gSystem->AddIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/ -I$ALICE_ROOT/include -I$ALICE_ROOT/STEER  -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/PWG0 -I$ALICE_ROOT/PWGPP -I$ALICE_ROOT/PWG2 -I$ALICE_ROOT/PWG3 -I$ALICE_ROOT/PWG3/vertexingHF -I$ALICE_ROOT/PWG4 -I$ALICE_ROOT/CORRFW -I$ALICE_ROOT/TPC -I$ALICE_ROOT/TRD -I$ALICE_ROOT/PWG3/muon -I$ALICE_ROOT/JETAN -I$ALICE_ROOT/ANALYSIS/Tender");
+    gSystem->AddIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/ -I$ALICE_ROOT/include -I$ALICE_ROOT/STEER  -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/PWG0 -I$ALICE_ROOT/PWGPP -I$ALICE_ROOT/PWG2 -I$ALICE_ROOT/PWG3 -I$ALICE_ROOT/PWG3/vertexingHF -I$ALICE_ROOT/PWG4 -I$ALICE_ROOT/CORRFW -I$ALICE_ROOT/TPC -I$ALICE_ROOT/TRD -I$ALICE_ROOT/PWG3/muon -I$ALICE_ROOT/JETAN -I$ALICE_ROOT/TENDER/Tender");
     
   gSystem->Load("libCore");
   gSystem->Load("libPhysics");
index 7a3efc3..a53482b 100644 (file)
@@ -33,7 +33,7 @@ TString objname = "dNdPtAnalysis_" + id;
     /*
     //load required libraries
     //load required libraries    
-    gSystem->AddIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/ -I$ALICE_ROOT/include -I$ALICE_ROOT/STEER  -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/PWG0 -I$ALICE_ROOT/PWGPP -I$ALICE_ROOT/PWG2 -I$ALICE_ROOT/PWG3 -I$ALICE_ROOT/PWG3/vertexingHF -I$ALICE_ROOT/PWG4 -I$ALICE_ROOT/CORRFW -I$ALICE_ROOT/TPC -I$ALICE_ROOT/TRD -I$ALICE_ROOT/PWG3/muon -I$ALICE_ROOT/JETAN -I$ALICE_ROOT/ANALYSIS/Tender");
+    gSystem->AddIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/ -I$ALICE_ROOT/include -I$ALICE_ROOT/STEER  -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/PWG0 -I$ALICE_ROOT/PWGPP -I$ALICE_ROOT/PWG2 -I$ALICE_ROOT/PWG3 -I$ALICE_ROOT/PWG3/vertexingHF -I$ALICE_ROOT/PWG4 -I$ALICE_ROOT/CORRFW -I$ALICE_ROOT/TPC -I$ALICE_ROOT/TRD -I$ALICE_ROOT/PWG3/muon -I$ALICE_ROOT/JETAN -I$ALICE_ROOT/TENDER/Tender");
     
   gSystem->Load("libCore");
   gSystem->Load("libPhysics");
index 89a0ec0..87e1538 100644 (file)
@@ -20,7 +20,7 @@ Double_t GenerateCorrMatr(const char* mcfile, const char* mctask, const char* id
     
     //load required libraries
     //load required libraries    
-    gSystem->AddIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/ -I$ALICE_ROOT/include -I$ALICE_ROOT/STEER  -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/PWG0 -I$ALICE_ROOT/PWGPP -I$ALICE_ROOT/PWG2 -I$ALICE_ROOT/PWG3 -I$ALICE_ROOT/PWG3/vertexingHF -I$ALICE_ROOT/PWG4 -I$ALICE_ROOT/CORRFW -I$ALICE_ROOT/TPC -I$ALICE_ROOT/TRD -I$ALICE_ROOT/PWG3/muon -I$ALICE_ROOT/JETAN -I$ALICE_ROOT/ANALYSIS/Tender");
+    gSystem->AddIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/ -I$ALICE_ROOT/include -I$ALICE_ROOT/STEER  -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/PWG0 -I$ALICE_ROOT/PWGPP -I$ALICE_ROOT/PWG2 -I$ALICE_ROOT/PWG3 -I$ALICE_ROOT/PWG3/vertexingHF -I$ALICE_ROOT/PWG4 -I$ALICE_ROOT/CORRFW -I$ALICE_ROOT/TPC -I$ALICE_ROOT/TRD -I$ALICE_ROOT/PWG3/muon -I$ALICE_ROOT/JETAN -I$ALICE_ROOT/TENDER/Tender");
     
   gSystem->Load("libCore");
   gSystem->Load("libPhysics");
index 2474fd9..3038c84 100644 (file)
@@ -39,7 +39,7 @@ if ( id.Contains("c90-100") ) { c_first = c_last = 11; }
     
     //load required libraries
     //load required libraries    
-    gSystem->AddIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/ -I$ALICE_ROOT/include -I$ALICE_ROOT/STEER  -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/PWG0 -I$ALICE_ROOT/PWGPP -I$ALICE_ROOT/PWG2 -I$ALICE_ROOT/PWG3 -I$ALICE_ROOT/PWG3/vertexingHF -I$ALICE_ROOT/PWG4 -I$ALICE_ROOT/CORRFW -I$ALICE_ROOT/TPC -I$ALICE_ROOT/TRD -I$ALICE_ROOT/PWG3/muon -I$ALICE_ROOT/JETAN -I$ALICE_ROOT/ANALYSIS/Tender");
+    gSystem->AddIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/ -I$ALICE_ROOT/include -I$ALICE_ROOT/STEER  -I$ALICE_ROOT/ANALYSIS -I$ALICE_ROOT/PWG0 -I$ALICE_ROOT/PWGPP -I$ALICE_ROOT/PWG2 -I$ALICE_ROOT/PWG3 -I$ALICE_ROOT/PWG3/vertexingHF -I$ALICE_ROOT/PWG4 -I$ALICE_ROOT/CORRFW -I$ALICE_ROOT/TPC -I$ALICE_ROOT/TRD -I$ALICE_ROOT/PWG3/muon -I$ALICE_ROOT/JETAN -I$ALICE_ROOT/TENDER/Tender");
     
   gSystem->Load("libCore");
   gSystem->Load("libPhysics");
index 4332cb6..b1b9b8a 100644 (file)
@@ -44,7 +44,7 @@ void runTriggerStudy(Char_t* data, Long64_t nev = -1, Long64_t offset = 0, Bool_
 
   // Add tender
 #ifdef TENDER
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+  gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
   AliAnalysisTask* tender=0x0;
   if(!isMC)
     {
index 372cf84..efb1bd6 100644 (file)
@@ -74,7 +74,7 @@ SteerAnalysisTaskTOFSpectraPbPb(const Char_t *inputfilename, Bool_t mcFlag = kFA
   gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPIDResponse.C");
   AddTaskPIDResponse();
 
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+  gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
   AddTaskTender(kFALSE,
                kFALSE,
                kTRUE,
index c93e8b4..e5e7b4e 100644 (file)
@@ -23,7 +23,7 @@ include_directories(${AliRoot_SOURCE_DIR}/PWGLF/STRANGENESS)
 include_directories(${ROOT_INCLUDE_DIRS}
                     ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
                     ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice
-                    ${AliRoot_SOURCE_DIR}/ANALYSIS/EventMixing
+                    ${AliRoot_SOURCE_DIR}/EVENTMIX
                     ${AliRoot_SOURCE_DIR}/CORRFW
                     ${AliRoot_SOURCE_DIR}/PWGCF/Correlations/Base
                     ${AliRoot_SOURCE_DIR}/PWGLF/STRANGENESS/Cascades/lightvertexers
index 6ff5479..054c019 100644 (file)
@@ -28,7 +28,7 @@ include_directories(${AliRoot_SOURCE_DIR}/PWGPP)
 include_directories(${ROOT_INCLUDE_DIRS}
                     ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
                     ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice
-                    ${AliRoot_SOURCE_DIR}/ANALYSIS/Tender
+                    ${AliRoot_SOURCE_DIR}/TENDER/Tender
                     ${AliRoot_SOURCE_DIR}/CORRFW
                     ${AliRoot_SOURCE_DIR}/EMCAL/EMCALUtils
                     ${AliRoot_SOURCE_DIR}/HMPID/HMPIDbase
index bc0f782..68f8668 100755 (executable)
@@ -20,7 +20,7 @@ void AddTaskCPQA(Bool_t useMC = kFALSE, Bool_t useTender = kFALSE) {
    
 
 if(useTender) {
-  gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/TenderSupplies/AddTaskTender.C");
+  gROOT->LoadMacro("$ALICE_ROOT/TENDER/TenderSupplies/AddTaskTender.C");
   gROOT->LoadMacro("AddTaskTender.C");
   AliAnalysisTask* tender=0x0;
 if(!useMC)
index 8bdf4bf..1da4a91 100755 (executable)
@@ -45,7 +45,7 @@
 #include "AliESDEvent.h"  
 #include "AliESDInputHandler.h"
 #include "AliESDInputHandlerRP.h"
-#include "../ANALYSIS/EventMixing/AliMixEventInputHandler.h"
+#include "../EVENTMIX/AliMixEventInputHandler.h"
 #include "AliCDBPath.h"
 #include "AliCDBManager.h"
 #include "AliCDBEntry.h"
index ef1b309..028e81e 100755 (executable)
@@ -44,7 +44,7 @@
 #include "AliESDEvent.h"  
 #include "AliESDInputHandler.h"
 #include "AliESDInputHandlerRP.h"
-#include "../ANALYSIS/EventMixing/AliMixEventInputHandler.h"
+#include "../EVENTMIX/AliMixEventInputHandler.h"
 #include "AliCDBPath.h"
 #include "AliCDBManager.h"
 #include "AliCDBEntry.h"
index 265959f..6d60b4a 100755 (executable)
@@ -39,7 +39,7 @@
 #include "AliESDEvent.h"  
 #include "AliESDInputHandler.h"
 #include "AliESDInputHandlerRP.h"
-//#include "../ANALYSIS/EventMixing/AliMixEventInputHandler.h"
+//#include "../EVENTMIX/AliMixEventInputHandler.h"
 #include "AliCDBPath.h"
 #include "AliCDBManager.h"
 #include "AliCDBEntry.h"
index 725d658..8be8d4c 100644 (file)
@@ -23,7 +23,7 @@ include_directories(${AliRoot_SOURCE_DIR}/ANALYSIS/${MODULE})
 include_directories(${ROOT_INCLUDE_DIRS}
                     ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
                     ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice
-                    ${AliRoot_SOURCE_DIR}/ANALYSIS/Tender
+                    ${AliRoot_SOURCE_DIR}/TENDER/Tender
                     ${AliRoot_SOURCE_DIR}/EMCAL/EMCALbase
                     ${AliRoot_SOURCE_DIR}/EMCAL/EMCALrec
                     ${AliRoot_SOURCE_DIR}/EMCAL/EMCALUtils
@@ -98,5 +98,5 @@ install(TARGETS ${MODULE}
 install(FILES ${HDRS} DESTINATION include)
 
 # Install macros
-install(FILES AddTaskTender.C DESTINATION ANALYSIS/TenderSupplies)
+install(FILES AddTaskTender.C DESTINATION TENDER/TenderSupplies)