Various minor fixes

diff --git a/PWGLF/FORWARD/trains/GridHelper.C b/PWGLF/FORWARD/trains/GridHelper.C
index a84bf2ac9b425eb5787881636a97f21b7f5c468a..a783be45cad1c8b2dcde1e1674a0356503d0bbd7 100644 (file)
--- a/PWGLF/FORWARD/trains/GridHelper.C
+++ b/PWGLF/FORWARD/trains/GridHelper.C
@@ -594,6 +594,7 @@ struct GridHelper : public PluginHelper
       << "    }\n"
       << "    base = sub;\n"
       << "  }\n"
+      << "  gEnv->SetValue(\"XSec.GSI.DelegProxy\", \"2\");\n"
       << "  AliAnalysisManager* mgr= "
       << "AliAnalysisAlien::LoadAnalysisManager(base);\n"
       << "  if (!mgr) {\n"
@@ -688,6 +689,7 @@ struct GridHelper : public PluginHelper
       << "}\n\n"
       << "void Download()\n"
       << "{\n"
+      << "  gEnv->SetValue(\"XSec.GSI.DelegProxy\", \"2\");\n"
       << "  if (!TGrid::Connect(\"alien://\")) {\n"
       << "    Error(\"Download\",\"Failed to connect to AliEn\");\n"
       << "    return;\n"

diff --git a/PWGLF/FORWARD/trains/MakeFMDELossTrain.C b/PWGLF/FORWARD/trains/MakeFMDELossTrain.C
index 7b902a1bbf1eb8727f3aa0c72fe464fd2322ab9a..cfb188118532cbfb871ab490e1a77ddf3dd3a6a4 100644 (file)
--- a/PWGLF/FORWARD/trains/MakeFMDELossTrain.C
+++ b/PWGLF/FORWARD/trains/MakeFMDELossTrain.C
@@ -119,7 +119,7 @@ protected:
       << "{\n"
       << "  gROOT->LoadMacro(\"$ALICE_ROOT/PWGLF/FORWARD/analysis2/corrs/ExtractELoss.C\");\n"
       << "  ExtractELoss(\"forward_eloss.root\"," 
-      <<  fOptions.Has("mc") << ");\n"
+      <<  fHelper->IsMC() << ");\n"
       << "}\n"
       << "// EOF" << std::endl;
     f.close();

diff --git a/PWGLF/FORWARD/trains/MakeMCCorrTrain.C b/PWGLF/FORWARD/trains/MakeMCCorrTrain.C
index f24c47a43b55871648b4016fbacd7fe02f84f112..781435ea166b317e4d6398a008367f53ee043fc1 100644 (file)
--- a/PWGLF/FORWARD/trains/MakeMCCorrTrain.C
+++ b/PWGLF/FORWARD/trains/MakeMCCorrTrain.C
@@ -54,7 +54,7 @@ protected:
     if (!mgr->GetMCtruthEventHandler()) return;
     
     // --- Task to copy header information ---------------------------
-    gROOT->Macro("AddTaskCopyHeader.C");
+    // gROOT->Macro("AddTaskCopyHeader.C");
 
     // --- Add the task ----------------------------------------------
     gROOT->Macro("AddTaskForwardMCCorr.C"); 

diff --git a/PWGLF/FORWARD/trains/PluginHelper.C b/PWGLF/FORWARD/trains/PluginHelper.C
index 24461c7ef50f3d6db7e1387dc495f2266e661f02..20bdc2c6691e33a69575bd4a23d123165b1a8596 100644 (file)
--- a/PWGLF/FORWARD/trains/PluginHelper.C
+++ b/PWGLF/FORWARD/trains/PluginHelper.C
@@ -217,8 +217,7 @@ struct PluginHelper : public Helper
     fHandler->SetROOTVersion(root);
     fHandler->SetAliROOTVersion(aliroot);
     // Execute through interpreter until patch is applied
-    gROOT->ProcessLine(Form("((AliAnalysisAlien*)%p)->SetDropToShell(false);",
-                           fHandler));
+    fHandler->SetDropToShell(false);
     if (fOptions.Has("mode"))
       fHandler->SetAliRootMode(fOptions.Get("mode"));
     else 

diff --git a/PWGLF/FORWARD/trains/RunTrain.C b/PWGLF/FORWARD/trains/RunTrain.C
index 4223f15b856523d466cb248b4eaa3497d986d6b6..a23420d8aba50f10360c49a34937cf9afe92a518 100644 (file)
--- a/PWGLF/FORWARD/trains/RunTrain.C
+++ b/PWGLF/FORWARD/trains/RunTrain.C
@@ -51,6 +51,9 @@ BuildHelpers(Bool_t verbose, Bool_t force, Bool_t debug,
             Bool_t all=false)
 {
   gSystem->AddIncludePath("-I$ALICE_ROOT/include");
+  gSystem->AddIncludePath("-I$ALICE_ROOT/PWGLF/FORWARD/trains/");
+  gROOT->SetMacroPath(Form("%s:$ALICE_ROOT/PWGLF/FORWARD/trains",
+                          gROOT->GetMacroPath()));
   gSystem->Load("libANALYSIS");
   gSystem->Load("libANALYSISalice");
   const char* scripts[] = { "AvailableSoftware",