Merge branch 'master' into TPCdev

[u/mrichter/AliRoot.git] / PWGJE / EMCALJetTasks / macros / AddTaskJetEmbeddingFromAOD.C

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskJetEmbeddingFromAOD.C b/PWGJE/EMCALJetTasks/macros/AddTaskJetEmbeddingFromAOD.C
index deba4f7615b7abac7540dd4f2fdab90d243c23fa..17fdaae73c218e2832cb5fb84efdf043fd13ba46 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskJetEmbeddingFromAOD.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskJetEmbeddingFromAOD.C
@@ -1,4 +1,4 @@
-// $Id: AddTaskJetEmbeddingFromAOD.C  $
+// $Id$
 
 TObjArray* GenerateFileList(const char* list, Int_t nFiles);
 
@@ -14,7 +14,7 @@ AliJetEmbeddingFromAODTask* AddTaskJetEmbeddingFromAOD(
   const char     *aodCellsName  = "emcalCells",
   const char     *aodMCPartName = "",
   const char     *runperiod     = "lhc11h",
-  Bool_t          includeNoITS  = kTRUE,
+  Bool_t          includeNoITS  = kFALSE,
   Double_t        minCent       = 0,
   Double_t        maxCent       = 10,
   UInt_t          mask          = AliVEvent::kAny,
@@ -65,15 +65,15 @@ AliJetEmbeddingFromAODTask* AddTaskJetEmbeddingFromAOD(
   jetEmb->SetIncludeNoITS(includeNoITS);
   TString runPeriod(runperiod);
   runPeriod.ToLower();
-  if (runPeriod == "lhc11h") {
-    jetEmb->SetAODfilterBits(256,512); // hybrid tracks for LHC11h
+  if (runPeriod == "lhc11h" || runPeriod == "lhc12a15e") {
+    jetEmb->SetAODfilterBits(256,512); // hybrid tracks for LHC11h and LHC12a15e
   }
-  else if (runPeriod == "lhc11a" || runPeriod == "lhc12a15a" || runPeriod == "lhc12a15e") {
-    jetEmb->SetAODfilterBits(256,16); // hybrid tracks for LHC11a, LHC12a15a and LHC12a15e
+  else if (runPeriod == "lhc11a" || runPeriod == "lhc12a15a") {
+    jetEmb->SetAODfilterBits(256,16); // hybrid tracks for LHC11a and LHC12a15a
   }
   else {
-    if (runPeriod.IsNull())
-      ::Warning("Run period %s not known. It will use IsHybridGlobalConstrainedGlobal.");
+    if (!runPeriod.IsNull())
+      ::Warning("Run period %s not known. It will use IsHybridGlobalConstrainedGlobal.", runPeriod.Data());
   }
 
   //-------------------------------------------------------