Merge branch 'feature-movesplit'

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

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskRhoAverage.C b/PWGJE/EMCALJetTasks/macros/AddTaskRhoAverage.C
index ae9f3b4b433d86eeb17508cebec1665b6980eee0..01f25aa478fa61ed6181b7333c9f31fb1ec3b0e8 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskRhoAverage.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskRhoAverage.C
@@ -6,10 +6,11 @@ AliAnalysisTaskRhoAverage* AddTaskRhoAverage(
    const char    *nClusters   = "CaloClusters",  
    const char    *nRho        = "Rho",
    Double_t       jetradius   = 0.2,
-   UInt_t         type        = AliAnalysisTaskEmcal::kTPC,
+   const char    *cutType     = "TPC",
    Double_t       jetareacut  = 0.01,
    Double_t       emcareacut  = 0,
-   Double_t       ptcut       = 0.15,
+   Double_t       trackptcut  = 0.15,
+   Double_t       clusptcut   = 0.30,
    TF1           *sfunc       = 0,
    const UInt_t   exclPart    = 2,
    const UInt_t   rhotype     = 1,
@@ -38,28 +39,29 @@ AliAnalysisTaskRhoAverage* AddTaskRhoAverage(
   // Init the task and do settings
   //-------------------------------------------------------
 
-  TString name(Form("%s_%s_%s_", taskname, nTracks, nClusters));
-  if (type == AliAnalysisTaskEmcal::kTPC) 
-    name += "TPC";
-  else if (type == AliAnalysisTaskEmcal::kEMCAL) 
-    name += "EMCAL";
-  else if (type == AliAnalysisTaskEmcal::kUser) 
-    name += "USER";
+  TString name(Form("%s_%s_%s_%s", taskname, nTracks, nClusters, cutType));
+
   AliAnalysisTaskRhoAverage *rhotask = new AliAnalysisTaskRhoAverage(name, histo);
-  rhotask->SetAnaType(type);
-  rhotask->SetScaleFunction(sfunc);
-  rhotask->SetJetsName(nJets);
-  rhotask->SetTracksName(nTracks);
-  rhotask->SetClusName(nClusters);
-  rhotask->SetRhoName(nRho);
-  rhotask->SetJetAreaCut(jetareacut);
-  rhotask->SetAreaEmcCut(emcareacut);
-  rhotask->SetPtCut(ptcut);
-  rhotask->SetJetPtCut(0);
-  rhotask->SetJetRadius(jetradius);
   rhotask->SetExcludeLeadPart(exclPart);
+  rhotask->SetScaleFunction(sfunc);
+  rhotask->SetOutRhoName(nRho);
   rhotask->SetRhoType(rhotype);
 
+  AliParticleContainer *trackCont = rhotask->AddParticleContainer(nTracks);
+  if (trackCont) trackCont->SetTrackPtCut(trackptcut);
+
+  AliClusterContainer *clusterCont = rhotask->AddClusterContainer(nClusters);
+  if (clusterCont) clusterCont->SetClusPtCut(clusptcut);
+
+  AliJetContainer *jetCont = rhotask->AddJetContainer(nJets,cutType,jetradius);
+  if (jetCont) {
+    jetCont->SetJetAreaCut(jetareacut);
+    jetCont->SetAreaEmcCut(emcareacut);
+    jetCont->SetJetPtCut(0);
+    jetCont->ConnectParticleContainer(trackCont);
+    jetCont->ConnectClusterContainer(clusterCont);
+  }
+
   //-------------------------------------------------------
   // Final settings, pass to manager and set the containers
   //-------------------------------------------------------