Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGJE / EMCALJetTasks / UserTasks / AliAnalysisTaskEmcalDiJetAna.cxx

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetAna.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetAna.cxx
index 196cf97026527249321fc13964391c5bc2d62819..59ba028815d9c73fd9fab39812d508fd4b2d2f44 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetAna.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetAna.cxx
@@ -38,6 +38,7 @@ ClassImp(AliAnalysisTaskEmcalDiJetAna)
 AliAnalysisTaskEmcalDiJetAna::AliAnalysisTaskEmcalDiJetAna() : 
   AliAnalysisTaskEmcalDiJetBase("AliAnalysisTaskEmcalDiJetAna"),
   fDoMatchFullCharged(kTRUE),
+  fNKtBins(30),
   fNDiJetEtaBins(1),
   fNAjBins(1),
   fh2CentRhoCh(0),
@@ -72,6 +73,7 @@ AliAnalysisTaskEmcalDiJetAna::AliAnalysisTaskEmcalDiJetAna() :
 AliAnalysisTaskEmcalDiJetAna::AliAnalysisTaskEmcalDiJetAna(const char *name) : 
   AliAnalysisTaskEmcalDiJetBase(name),
   fDoMatchFullCharged(kTRUE),
+  fNKtBins(30),
   fNDiJetEtaBins(1),
   fNAjBins(1),
   fh2CentRhoCh(0),
@@ -161,7 +163,7 @@ void AliAnalysisTaskEmcalDiJetAna::UserCreateOutputObjects()
   const Int_t nBinsSparse0 = 7;
   const Int_t nBinsPtW      = 30;
   const Int_t nBinsDPhi     = 72;
-  const Int_t nBinsKt       = 30;
+  const Int_t nBinsKt       = fNKtBins;
   const Int_t nBinsDiJetEta = fNDiJetEtaBins;//40;
   const Int_t nBinsCentr    = fNcentBins;
   const Int_t nBinsAj       = fNAjBins;//20
@@ -401,9 +403,11 @@ void AliAnalysisTaskEmcalDiJetAna::CorrelateTwoJets(const Int_t type) {
     if(!jetAssoc)
       continue;
 
-    if(type==0 || type==1) {
-      if(GetJetPt(jetAssoc,typea)>jetTrigPt)
-       continue;
+    if(fDoPtBias) {
+      if(type==0 || type==1) {
+       if(GetJetPt(jetAssoc,typea)>jetTrigPt)
+         continue;
+      }
     }
 
     FillDiJetHistos(jetTrig,jetAssoc, type);