Charged jets (pPb): Allow arbitrary eta ranges

[u/mrichter/AliRoot.git] / PWGJE / EMCALJetTasks / AliAnalysisTaskRhoFlow.cxx

diff --git a/PWGJE/EMCALJetTasks/AliAnalysisTaskRhoFlow.cxx b/PWGJE/EMCALJetTasks/AliAnalysisTaskRhoFlow.cxx
index a8de79da3acd64300dc52eeaf86a34d6be7b0c07..9abb43ecce550677b654a11e793c7d53b376dde0 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliAnalysisTaskRhoFlow.cxx
+++ b/PWGJE/EMCALJetTasks/AliAnalysisTaskRhoFlow.cxx
@@ -1,4 +1,4 @@
-// $Id: AliAnalysisTaskRhoFlow.cxx  $
+// $Id$
 //
 // Calculation of rho for flow bias studies
 //
@@ -96,6 +96,7 @@ Bool_t AliAnalysisTaskRhoFlow::Run()
   if (!fTracks)
     return kFALSE;
   
+  Double_t jetRadius = GetJetRadius();
   Double_t maxTrackPhi = -1;
   Double_t maxTrackPt  = 0;
 
@@ -116,8 +117,8 @@ Bool_t AliAnalysisTaskRhoFlow::Run()
   Double_t maxPhi = -1;
 
   // away side
-  minPhi = maxTrackPhi + TMath::Pi() - TMath::Pi()/4 + fJetRadius;
-  maxPhi = maxTrackPhi + TMath::Pi() + TMath::Pi()/4 + fJetRadius;
+  minPhi = maxTrackPhi + TMath::Pi() - TMath::Pi()/4 + jetRadius;
+  maxPhi = maxTrackPhi + TMath::Pi() + TMath::Pi()/4 + jetRadius;
   if (maxPhi > TMath::Pi() * 2) {
     minPhi -= TMath::Pi() * 2;
     maxPhi -= TMath::Pi() * 2;
@@ -125,11 +126,11 @@ Bool_t AliAnalysisTaskRhoFlow::Run()
   SetJetPhiLimits(minPhi, maxPhi);  
   fNExclLeadJets = 1;
   AliAnalysisTaskRho::Run();
-  fRhoAwaySide = fRho->GetVal();
+  fRhoAwaySide = fOutRho->GetVal();
 
   // perp 1 side
-  minPhi = maxTrackPhi + TMath::Pi()/2 - TMath::Pi()/4 + fJetRadius;
-  maxPhi = maxTrackPhi + TMath::Pi()/2 + TMath::Pi()/4 + fJetRadius;
+  minPhi = maxTrackPhi + TMath::Pi()/2 - TMath::Pi()/4 + jetRadius;
+  maxPhi = maxTrackPhi + TMath::Pi()/2 + TMath::Pi()/4 + jetRadius;
   if (maxPhi > TMath::Pi() * 2) {
     minPhi -= TMath::Pi() * 2;
     maxPhi -= TMath::Pi() * 2;
@@ -137,11 +138,11 @@ Bool_t AliAnalysisTaskRhoFlow::Run()
   SetJetPhiLimits(minPhi, maxPhi);  
   fNExclLeadJets = 0;
   AliAnalysisTaskRho::Run();
-  fRhoPerpSide1 = fRho->GetVal();
+  fRhoPerpSide1 = fOutRho->GetVal();
 
   // perp 2 side
-  minPhi = maxTrackPhi - TMath::Pi()/2 - TMath::Pi()/4 + fJetRadius;
-  maxPhi = maxTrackPhi - TMath::Pi()/2 + TMath::Pi()/4 + fJetRadius;
+  minPhi = maxTrackPhi - TMath::Pi()/2 - TMath::Pi()/4 + jetRadius;
+  maxPhi = maxTrackPhi - TMath::Pi()/2 + TMath::Pi()/4 + jetRadius;
   if (maxPhi > TMath::Pi() * 2) {
     minPhi -= TMath::Pi() * 2;
     maxPhi -= TMath::Pi() * 2;
@@ -149,11 +150,11 @@ Bool_t AliAnalysisTaskRhoFlow::Run()
   SetJetPhiLimits(minPhi, maxPhi);
   fNExclLeadJets = 0;
   AliAnalysisTaskRho::Run();
-  fRhoPerpSide2 = fRho->GetVal();
+  fRhoPerpSide2 = fOutRho->GetVal();
 
   // near side
-  minPhi = maxTrackPhi - TMath::Pi()/4 + fJetRadius;
-  maxPhi = maxTrackPhi + TMath::Pi()/4 + fJetRadius;
+  minPhi = maxTrackPhi - TMath::Pi()/4 + jetRadius;
+  maxPhi = maxTrackPhi + TMath::Pi()/4 + jetRadius;
   if (maxPhi > TMath::Pi() * 2) {
     minPhi -= TMath::Pi() * 2;
     maxPhi -= TMath::Pi() * 2;
@@ -161,7 +162,7 @@ Bool_t AliAnalysisTaskRhoFlow::Run()
   SetJetPhiLimits(minPhi, maxPhi);
   fNExclLeadJets = 1;
   AliAnalysisTaskRho::Run();
-  fRhoNearSide = fRho->GetVal();
+  fRhoNearSide = fOutRho->GetVal();
   
   return kTRUE;
 }