Add option to select physical primary particles; make lock feature optional

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJet.C b/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJet.C
index 070ce8a3d6a932ddfc1b3957c1f5d9d363cf1a59..317518e233fac08c834a2f4341f8096246cdecdd 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJet.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJet.C
@@ -1,16 +1,16 @@
-// $Id$ 
-
 AliEmcalJetTask* AddTaskEmcalJet(
-  const UInt_t type          = AliEmcalJetTask::kAKT | AliEmcalJetTask::kFullJet | AliEmcalJetTask::kR040Jet,
-  const char *nTracks        = "Tracks",
-  const char *nClusters      = "CaloClusters",
-  const Double_t minTrPt     = 0.15,
-  const Double_t minClPt     = 0.30,
-  const Double_t ghostArea   = 0.005,
-  const Double_t radius      = 0.4,
-  const Int_t recombScheme   = 1,
-  const char *tag            = "Jet",
-  const Double_t minJetPt    = 0.
+  const UInt_t type           = AliEmcalJetTask::kAKT | AliEmcalJetTask::kFullJet | AliEmcalJetTask::kR040Jet,
+  const char *nTracks         = "Tracks",
+  const char *nClusters       = "CaloClusters",
+  const Double_t minTrPt      = 0.15,
+  const Double_t minClPt      = 0.30,
+  const Double_t ghostArea    = 0.005,
+  const Double_t radius       = 0.4,
+  const Int_t recombScheme    = 1,
+  const char *tag             = "Jet",
+  const Double_t minJetPt     = 0.,
+  const Bool_t selectPhysPrim = kFALSE,
+  const Bool_t lockTask       = kTRUE
 )
 {  
   // Get the pointer to the existing analysis manager via the static access method.
@@ -126,7 +126,8 @@ AliEmcalJetTask* AddTaskEmcalJet(
     jetTask->SetRadius(radius);
   jetTask->SetGhostArea(ghostArea);
   jetTask->SetRecombScheme(recombScheme);
-  jetTask->SetLocked();
+  jetTask->SelectPhysicalPrimaries(selectPhysPrim);
+  if (lockTask) jetTask->SetLocked();
 
   //-------------------------------------------------------
   // Final settings, pass to manager and set the containers
@@ -153,7 +154,9 @@ AliEmcalJetTask* AddTaskEmcalJet(
   const Double_t ghostArea   = 0.005,
   const Int_t recombScheme   = 1,
   const char *tag            = "Jet",
-  const Double_t minJetPt    = 0.
+  const Double_t minJetPt    = 0.,
+  const Bool_t selectPhysPrim = kFALSE,
+  const Bool_t lockTask       = kTRUE
 )
 {  
   UInt_t jetType = 0;
@@ -184,5 +187,5 @@ AliEmcalJetTask* AddTaskEmcalJet(
     return NULL;
   }
 
-  return AddTaskEmcalJet(jetType, nTracks, nClusters, minTrPt, minClPt, ghostArea, radius, recombScheme, tag, minJetPt);
+  return AddTaskEmcalJet(jetType, nTracks, nClusters, minTrPt, minClPt, ghostArea, radius, recombScheme, tag, minJetPt, selectPhysPrim, lockTask);
 }