fix from rosi

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskJetPreparation.C b/PWGJE/EMCALJetTasks/macros/AddTaskJetPreparation.C
index d0daa75d86e063c435e18f742bc711e54ea0e4c3..5f5dfbe871b119e759a18648e41be70406b114eb 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskJetPreparation.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskJetPreparation.C
@@ -33,12 +33,17 @@ AliAnalysisTaskSE* AddTaskJetPreparation(
   TString period(periodstr);
   TString clusterColName(usedClusters);
   TString particleColName(usedMCParticles);
+  TString hybridperiod("");
 
-  if ( (period != "LHC11h") && (period!="LHC11a") )
-  {
-    Error("AddTaskJetPreparation","###################################################");
-    Error("AddTaskJetPreparation","Run period in AddTaskJetPreparation.C not recognized! You have to specify it for the used period, if you need jets!");
-    Error("AddTaskJetPreparation","###################################################");
+  if (period.BeginsWith("lhc13") || period.BeginsWith("lhc12g") || 
+      period.BeginsWith("lhc11h") || period.BeginsWith("lhc12a15a") || period.BeginsWith("lhc12a15f"))
+    hybridperiod = "LHC11h";
+  else if (period.BeginsWith("lhc11a"))
+    hybridperiod = "LHC11a";
+  else {
+    ::Error("AddTaskEmcalJetPreparation","###################################################");
+    ::Error("AddTaskEmcalJetPreparation","Run period in AddTaskJetPreparation.C not recognized! You have to specify it for the used period, if you need jets!");
+    ::Error("AddTaskEmcalJetPreparation","###################################################");
     return 0;
   }    
 
@@ -56,7 +61,7 @@ AliAnalysisTaskSE* AddTaskJetPreparation(
     if (dType == "ESD")
     {
       inputTracks = "HybridTracks";
-      TString trackCuts(Form("Hybrid_%s", period.Data()));
+      TString trackCuts(Form("Hybrid_%s", hybridperiod.Data()));
       // Hybrid tracks maker for ESD
       gROOT->LoadMacro("$ALICE_ROOT/PWG/EMCAL/macros/AddTaskEmcalEsdTpcTrack.C");
       AliEmcalEsdTpcTrackTask *hybTask = AddTaskEmcalEsdTpcTrack(inputTracks.Data(),trackCuts.Data());