Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGLF / RESONANCES / macros / lego_train / AddAMRsn.C

diff --git a/PWGLF/RESONANCES/macros/lego_train/AddAMRsn.C b/PWGLF/RESONANCES/macros/lego_train/AddAMRsn.C
index a5cbf45a98ab053d2604363dac8ee3fdf35f0169..c9817f2fa081af1f43620547fdfe7c569b9cf0f0 100644 (file)
--- a/PWGLF/RESONANCES/macros/lego_train/AddAMRsn.C
+++ b/PWGLF/RESONANCES/macros/lego_train/AddAMRsn.C
@@ -46,8 +46,8 @@ Bool_t AddAMRsnTrain(TString analysisSource = "proof", TString analysisMode = "t
    TString extraMacro = "";
    TString extraMacroArgs = "";
 //   extraMacro = "RsnTrainSettingsExtra.C";
-//   extraMacroArgs = "10.0,10,1,1,1,1,1,1,1";
-//   extraMacroArgs = "10, 5, 5, -1, 1, 0, 1, 1, 1";
+//   extraMacroArgs = "10.0,10,1,1,1,1,1,1,1,0";
+//   extraMacroArgs = "10, 5, 5, -1, 1, 0, 1, 1, 1, 0";
 
    input.ToLower();
    inputMC.ToLower();
@@ -82,18 +82,18 @@ Bool_t AddAMRsnTrain(TString analysisSource = "proof", TString analysisMode = "t
 
       TString myAdditionalLibs;
       if (eventMixinPar) { AliAnalysisAlien::SetupPar("EventMixing"); myAdditionalLibs += " EventMixing.par"; }
-      else { gSystem->Load("libEventMixing.so"); myAdditionalLibs += " libEventMixing.so"; }
+      else { gSystem->Load("libEventMixing"); myAdditionalLibs += " libEventMixing.so"; }
 
       TString rsnLibName = "PWGLFresonances";
       if (gSystem->Getenv("ALICE_ROOT")) {
          TString alirootVersion = gSystem->GetFromPipe("aliroot --version | awk '{print $3}'");
          if (alirootVersion<"v5-02-19-AN" && alirootVersion.CompareTo("trunk")) rsnLibName = "PWG2resonances";
          if (rsnPar) { AliAnalysisAlien::SetupPar(rsnLibName.Data()); myAdditionalLibs += Form(" %s.par",rsnLibName.Data()); }
-         else { gSystem->Load(Form("lib%s.so",rsnLibName.Data())); myAdditionalLibs += Form(" lib%s.so",rsnLibName.Data()); }
+         else { gSystem->Load(Form("lib%s",rsnLibName.Data())); myAdditionalLibs += Form(" lib%s.so",rsnLibName.Data()); }
       }
       if (rsnParDev>=0) {
          if (rsnParDev) { AliAnalysisAlien::SetupPar("PWGLFresonancesdev"); myAdditionalLibs += " PWGLFresonancesdev.par"; }
-         else { gSystem->Load("libPWGLFresonancesdev.so"); myAdditionalLibs += " libPWGLFresonancesdev.so"; }
+         else { gSystem->Load("libPWGLFresonancesdev"); myAdditionalLibs += " libPWGLFresonancesdev.so"; }
       }
       analysisPlugin->SetAdditionalLibs(myAdditionalLibs.Data());
 
@@ -126,7 +126,7 @@ Bool_t AddAMRsnTrain(TString analysisSource = "proof", TString analysisMode = "t
 
       if (physSel>0) {
          if (!input.CompareTo("esd")) {
-            gROOT->LoadMacro("$ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C");
+            gROOT->LoadMacro("$ALICE_ROOT/OADB/macros/AddTaskPhysicsSelection.C");
             Bool_t physSelBigOut = kTRUE;
 //            physSelBigOut = kFALSE;
 
@@ -134,7 +134,7 @@ Bool_t AddAMRsnTrain(TString analysisSource = "proof", TString analysisMode = "t
             if (physSelBigOut) mrg->SetSpecialOutputLocation("root://aaa//aaa/");
          }
 
-         // maybe we can put it in $ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C
+         // maybe we can put it in $ALICE_ROOT/OADB/macros/AddTaskPhysicsSelection.C
          if (multiInputHandler) {
             AliInputEventHandler *ih = multiInputHandler->GetFirstInputEventHandler();
             ih->SetEventSelection(multiInputHandler->GetEventSelection());
@@ -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);
       }
 
@@ -163,9 +163,9 @@ Bool_t AddAMRsnTrain(TString analysisSource = "proof", TString analysisMode = "t
 
    } else {
 
-      gSystem->Load("libEventMixing.so");
-      gSystem->Load("libCORRFW.so");
-      gSystem->Load("libPWGLFresonances.so");
+      gSystem->Load("libEventMixing");
+      gSystem->Load("libCORRFW");
+      gSystem->Load("libPWGLFresonances");
    }
 
    if (!input.CompareTo("esd")) rsnBaseSettings.Append("_ESD");