From Marta:

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

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSample.C b/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSample.C
index 07d856182d49991fff1d37fec2dd45276abc057d..8f5969656e401da84da246158e0bb510097e3095 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSample.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSample.C
@@ -7,8 +7,8 @@ AliAnalysisTaskEmcalJetSample* AddTaskEmcalJetSample(
   const char *nrho               = "Rho",
   Double_t    jetradius          = 0.2,
   Double_t    jetptcut           = 1,
-  Double_t    jetareacut         = 0.557,
-  UInt_t      type               = AliAnalysisTaskEmcalJet::kEMCAL,
+  Double_t    jetareacut         = 0.6,
+  const char *type               = "EMCAL",
   Int_t       leadhadtype        = 0,
   const char *taskname           = "AliAnalysisTaskEmcalJetSample"
 )
@@ -43,25 +43,29 @@ AliAnalysisTaskEmcalJetSample* AddTaskEmcalJetSample(
     name += "_";
     name += nrho;
   }
-  if (type == AliJetContainer::kTPC) 
-    name += "_TPC";
-  else if (type == AliJetContainer::kEMCAL) 
-    name += "_EMCAL";
-  else if (type == AliJetContainer::kUser) 
-    name += "_USER";
+  if (strcmp(type,"")) {
+    name += "_";
+    name += type;
+  }
 
   Printf("name: %s",name.Data());
 
   AliAnalysisTaskEmcalJetSample* jetTask = new AliAnalysisTaskEmcalJetSample(name);
-  jetTask->SetAnaType(type);
-  jetTask->SetTracksName(ntracks);
-  jetTask->SetClusName(nclusters);
-  jetTask->SetJetsName(njets);
-  jetTask->SetRhoName(nrho);
-  jetTask->SetJetRadius(jetradius);
-  jetTask->SetJetPtCut(jetptcut);
-  jetTask->SetPercAreaCut(jetareacut);
-  jetTask->SetLeadingHadronType(leadhadtype);
+
+  AliParticleContainer *trackCont  = task->AddParticleContainer(ntracks);
+  AliClusterContainer *clusterCont = task->AddClusterContainer(nclusters);
+
+  TString strType(type);
+  AliJetContainer *jetCont = jetTask->AddJetContainer(njets,strType,R);
+  if(jetCont) {
+    jetCont->SetRhoName(nrho);
+    jetCont->ConnectParticleContainer(trackCont);
+    jetCont->ConnectClusterContainer(clusterCont);
+    jetCont->SetZLeadingCut(0.98,0.98);
+    jetCont->SetPercAreaCut(0.6);
+    jetCont->SetJetPtCut(jetptcut);    
+    jetCont->SetLeadingHadronType(leadhadtype);
+  }
   
   //-------------------------------------------------------
   // Final settings, pass to manager and set the containers