Small fixes for charged jets in pPb

Signed-off-by: loizides <cloizides@lbl.gov>

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskChargedJetsPA.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskChargedJetsPA.cxx
index 04e23b6926cd26268fb21a4dfb4ea26eaf845a22..19e3f1566bb1b529351434729ed6cc404ed488b2 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskChargedJetsPA.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskChargedJetsPA.cxx
@@ -137,6 +137,7 @@ void AliAnalysisTaskChargedJetsPA::Init()
     // ########## Default background estimates
     AddHistogram2D<TH2D>("hKTBackgroundImprovedCMS", "KT background density (Improved CMS approach)", "LEGO2", 400, 0., 40., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
     AddHistogram2D<TH2D>("hKTBackgroundImprovedCMSExternal", "KT background density (Improved CMS approach from external task)", "LEGO2", 400, 0., 40., fNumberOfCentralityBins, 0, 100, "#rho (GeV/c)","Centrality", "dN^{Events}/d#rho");
+    AddHistogram2D<TH2D>("hDeltaPtExternalBgrd", "Background fluctuations #delta p_{T} (KT, External)", "", 1201, -40.0, 40.0, fNumberOfCentralityBins, 0, 100, "#delta p_{T} (GeV/c)","Centrality","dN^{Jets}/d#delta p_{T}");
     AddHistogram2D<TH2D>("hDeltaPtKTImprovedCMS", "Background fluctuations #delta p_{T} (KT, Improved CMS-like)", "", 1201, -40.0, 40.0, fNumberOfCentralityBins, 0, 100, "#delta p_{T} (GeV/c)","Centrality","dN^{Jets}/d#delta p_{T}");
     AddHistogram2D<TH2D>("hDeltaPtKTImprovedCMSPartialExclusion", "Background fluctuations #delta p_{T} (KT, Improved CMS-like, partial jet exclusion)", "", 1201, -40.0, 40.0, fNumberOfCentralityBins, 0, 100, "#delta p_{T} (GeV/c)","Centrality","dN^{Jets}/d#delta p_{T}");
     AddHistogram2D<TH2D>("hDeltaPtKTImprovedCMSPartialExclusion_Signal", "Background fluctuations #delta p_{T} (KT, Improved CMS-like, partial jet exclusion w/ 1/N_{sig} probability)", "", 1201, -40.0, 40.0, fNumberOfCentralityBins, 0, 100, "#delta p_{T} (GeV/c)","Centrality","dN^{Jets}/d#delta p_{T}");
@@ -1925,6 +1926,8 @@ void AliAnalysisTaskChargedJetsPA::Calculate(AliVEvent* event)
     // Calculate the delta pt
     Double_t tmpDeltaPtNoBackground = GetDeltaPt(0.0);
     Double_t tmpDeltaPtKTImprovedCMS = GetDeltaPt(backgroundKTImprovedCMS);
+    Double_t tmpDeltaPtExternalBgrd = GetDeltaPt(backgroundKTImprovedCMSExternal);
+
 
     Double_t tmpDeltaPtKTImprovedCMSPartialExclusion = 0.0;
     if(fNcoll)
@@ -1959,6 +1962,8 @@ void AliAnalysisTaskChargedJetsPA::Calculate(AliVEvent* event)
 
     // If valid, fill the delta pt histograms
 
+    if(tmpDeltaPtExternalBgrd > -10000.0)
+      FillHistogram("hDeltaPtExternalBgrd", tmpDeltaPtExternalBgrd, centralityPercentile);
     if(tmpDeltaPtKTImprovedCMS > -10000.0)
       FillHistogram("hDeltaPtKTImprovedCMS", tmpDeltaPtKTImprovedCMS, centralityPercentile);
     if(tmpDeltaPtKTImprovedCMSPartialExclusion > -10000.0)

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskChargedJetsPA.C b/PWGJE/EMCALJetTasks/macros/AddTaskChargedJetsPA.C
index f9b6981de7d6648558d801a6899e83b7efcc617b..1b9a0437fd2189b548d8426de210de9292aa27a7 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskChargedJetsPA.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskChargedJetsPA.C
@@ -20,7 +20,8 @@ AliAnalysisTaskChargedJetsPA* AddTaskChargedJetsPA(
   Bool_t              isEMCalTrain            = kFALSE,
   Bool_t              calculateExternalRho    = kTRUE,
   Bool_t              analyzeDeprecatedBackgrounds = kTRUE,
-  Int_t               numberOfCentralityBins  = 20
+  Int_t               numberOfCentralityBins  = 20,
+  const char*         externalRhoName         = "ExternalRhoTask"
 )
 {
   // #### Detect the demanded trigger with its readable name
@@ -90,18 +91,14 @@ AliAnalysisTaskChargedJetsPA* AddTaskChargedJetsPA(
   // #### Define extern rho task
   if(calculateExternalRho)
   {
-    TString myRhoName("ExternalRhoTask");
-
-    AliAnalysisTaskRhoSparse* mgrTask = manager->GetTask(myRhoName.Data());
-    if(!mgrTask) // rho task does not yet exist
-    {
-      AliEmcalJetTask* jetFinderRho = AddTaskEmcalJet(usedTracks,"",1,0.4,1,0.150,0.300); // anti-kt
-      AliEmcalJetTask* jetFinderRhoKT = AddTaskEmcalJet(usedTracks,"",0,0.4,1,0.150,0.300); // kt
-      jetFinderRhoKT->SetMinJetPt(0);
-
-      gROOT->LoadMacro("$ALICE_ROOT/PWGJE/EMCALJetTasks/macros/AddTaskRhoSparse.C");
-      AliAnalysisTaskRhoSparse* rhotask = AddTaskRhoSparse(jetFinderRhoKT->GetName(), jetFinderRho->GetName(), usedTracks, "", myRhoName.Data(), jetRadius,"TPC", 0., 5., 0, 0,0,kFALSE,myRhoName.Data(),kTRUE);
-    }    
+    TString myRhoName(externalRhoName);
+
+    AliEmcalJetTask* jetFinderRho = AddTaskEmcalJet(usedTracks,"",1,0.4,1,0.150,0.300); // anti-kt
+    AliEmcalJetTask* jetFinderRhoKT = AddTaskEmcalJet(usedTracks,"",0,0.4,1,0.150,0.300); // kt
+    jetFinderRhoKT->SetMinJetPt(0);
+
+    gROOT->LoadMacro("$ALICE_ROOT/PWGJE/EMCALJetTasks/macros/AddTaskRhoSparse.C");
+    AliAnalysisTaskRhoSparse* rhotask = AddTaskRhoSparse(jetFinderRhoKT->GetName(), jetFinderRho->GetName(), usedTracks, "", myRhoName.Data(), 0.4,"TPC", 0., 5., 0, 0,0,kFALSE,myRhoName.Data(),kTRUE);
   }
 
   // #### Define analysis task