Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWG / EMCAL / macros / AddTaskEmcalPicoTrackMaker.C

diff --git a/PWG/EMCAL/macros/AddTaskEmcalPicoTrackMaker.C b/PWG/EMCAL/macros/AddTaskEmcalPicoTrackMaker.C
index fbc03511f5eb1a73fdb91faaa2f8d88047753268..666285190c3df7cdba2a09b8b507924693f8debe 100644 (file)
--- a/PWG/EMCAL/macros/AddTaskEmcalPicoTrackMaker.C
+++ b/PWG/EMCAL/macros/AddTaskEmcalPicoTrackMaker.C
@@ -2,16 +2,15 @@
 
 AliEmcalPicoTrackMaker* AddTaskEmcalPicoTrackMaker(
   const char *name         = "PicoTracks",
-  const char *inname       = "tracks",
-  const char *runperiod    = "",
-  Bool_t      includeNoITS = kTRUE,
+  const char *inname       = "FilterTracks",
   Double_t ptmin           = 0,
   Double_t ptmax           = 1000,
   Double_t etamin          = -10,
   Double_t etamax          = +10,
   Double_t phimin          = -10,
   Double_t phimax          = +10,
-  AliESDtrackCuts *cuts    = 0
+  Double_t trackeff        = 1.0,
+  const char *taskName     = "AliEmcalPicoTrackMaker"
 )
 {  
   // Get the pointer to the existing analysis manager via the static access method.
@@ -35,41 +34,13 @@ AliEmcalPicoTrackMaker* AddTaskEmcalPicoTrackMaker(
   // Init the task and do settings
   //-------------------------------------------------------
 
-  AliEmcalPicoTrackMaker *eTask = new AliEmcalPicoTrackMaker();
+  AliEmcalPicoTrackMaker *eTask = new AliEmcalPicoTrackMaker(taskName);
   eTask->SetTracksOutName(name);
   eTask->SetTracksInName(inname);
-  eTask->SetIncludeNoITS(includeNoITS);
   eTask->SetTrackPtLimits(ptmin, ptmax);
   eTask->SetTrackEtaLimits(etamin, etamax);
   eTask->SetTrackPhiLimits(phimin, phimax);
-
-  TString runPeriod(runperiod);
-  runPeriod.ToLower();
-  if (runPeriod == "lhc11h" || runPeriod == "lhc13b" || runPeriod == "lhc13c" || runPeriod == "lhc12g") {
-    eTask->SetAODfilterBits(256,512); // hybrid tracks for LHC11h
-    eTask->SetMC(kFALSE);
-  } else if (runPeriod == "lhc12a15e" || runPeriod == "lhc13b4" || runPeriod == "lhc12a15f") {
-    eTask->SetAODfilterBits(256,512); // hybrid tracks for LHC12a15e, LHC13b4, and LHC12a15f
-    eTask->SetMC(kTRUE);
-  } else if (runPeriod == "lhc11a") {
-    eTask->SetAODfilterBits(256,16); // hybrid tracks for LHC11a
-    eTask->SetMC(kFALSE);
-  } else if (runPeriod.Contains("lhc12a15a")) {
-    eTask->SetAODfilterBits(256,16); // hybrid tracks for LHC12a15a
-    eTask->SetMC(kTRUE);
-  } else if (runPeriod.Contains(":")) {
-    TObjArray *arr = runPeriod.Tokenize(":");
-    TString arg1(arr->At(0)->GetName());
-    TString arg2("-1");
-    if (arr->GetEntries()>1)
-      arg2 = arr->At(1)->GetName();
-    eTask->SetAODfilterBits(arg1.Atoi(),arg2.Atoi());
-    delete arr;
-  } else {
-    if (!runPeriod.IsNull())
-      ::Warning("Run period %s not known. It will use IsHybridGlobalConstrainedGlobal.", runPeriod.Data());
-  }
-  eTask->SetESDtrackCuts(cuts);
+  eTask->SetTrackEfficiency(trackeff);
 
   //-------------------------------------------------------
   // Final settings, pass to manager and set the containers
@@ -78,7 +49,7 @@ AliEmcalPicoTrackMaker* AddTaskEmcalPicoTrackMaker(
   
   // Create containers for input/output
   AliAnalysisDataContainer *cinput1  = mgr->GetCommonInputContainer();
-  mgr->ConnectInput  (eTask, 0,  cinput1 );
+  mgr->ConnectInput(eTask, 0, cinput1 );
   
   return eTask;
 }