Merge branch 'feature-movesplit'

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

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetResponse.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetResponse.cxx
index 82df38213abcb9ba4d2ee8a7f2b1bff937692189..09c93a6f994e136b4dbcef55e126830c54c1a311 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetResponse.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetResponse.cxx
@@ -21,7 +21,6 @@
 #include "AliEmcalJet.h"
 #include "AliRhoParameter.h"
 #include "AliLog.h"
-#include "AliAnalysisUtils.h"
 #include "AliEmcalParticle.h"
 #include "AliMCEvent.h"
 #include "AliGenPythiaEventHeader.h"
@@ -96,8 +95,6 @@ void AliAnalysisTaskEmcalDiJetResponse::UserCreateOutputObjects()
 {
   // Create user output.
 
-  InitOnce();
-
   AliAnalysisTaskEmcalDiJetBase::UserCreateOutputObjects();
 
   Bool_t oldStatus = TH1::AddDirectoryStatus();
@@ -196,16 +193,6 @@ void AliAnalysisTaskEmcalDiJetResponse::UserCreateOutputObjects()
   PostData(1, fOutput); // Post data for ALL output slots > 0 here.
 }
 
-//________________________________________________________________________
-Bool_t AliAnalysisTaskEmcalDiJetResponse::FillHistograms()
-{
-  // Fill histograms.
-
-
-
-  return kTRUE;
-}
-
 //________________________________________________________________________
 Bool_t AliAnalysisTaskEmcalDiJetResponse::Run()
 {
@@ -215,8 +202,6 @@ Bool_t AliAnalysisTaskEmcalDiJetResponse::Run()
   if(!SelectEvent())
     return kFALSE;
 
-  fHistTrialsSelEvents->Fill(fPtHardBin, fNTrials);
-
   if(fRhoType==0) {
     fRhoFullVal = 0.;
     fRhoChVal = 0.;
@@ -268,26 +253,22 @@ void AliAnalysisTaskEmcalDiJetResponse::CorrelateAllJets(const Int_t type) {
   //
 
   Int_t typet = 0;
-  Int_t typea = 0;
   Int_t typetMC = 0;
   Int_t typeaMC = 0;
   if(type==0) { //full-full
     typetMC = fContainerFullMC;
     typeaMC = fContainerFullMC;
     typet = fContainerFull;
-    typea = fContainerFull;
   }
   else if(type==1) { //charged-charged
     typetMC = fContainerChargedMC;
     typeaMC = fContainerChargedMC;
     typet = fContainerCharged;
-    typea = fContainerCharged;
   }
   else if(type==2) { //full-charged
     typetMC = fContainerFullMC;
     typeaMC = fContainerChargedMC;
     typet = fContainerFull;
-    typea = fContainerCharged;
   }
   else {
     AliWarning(Form("%s: type %d of dijet correlation not defined!",GetName(),type));
@@ -401,21 +382,16 @@ void AliAnalysisTaskEmcalDiJetResponse::CorrelateTwoJets(const Int_t type) {
   }
 
   Int_t nJetsTrig  = 0;
-  Int_t nJetsAssoc = 0;
   if(type==0) {
     nJetsTrig  = GetNJets(fContainerFullMC);
-    nJetsAssoc = nJetsTrig;
   }
   else if(type==1) {
     nJetsTrig  = GetNJets(fContainerChargedMC);
-    nJetsAssoc = nJetsTrig;
   }
   else if(type==2) {
     nJetsTrig  = GetNJets(fContainerFullMC);
-    nJetsAssoc = GetNJets(fContainerChargedMC);
   }
 
-
   for(Int_t ijt=0; ijt<nJetsTrig; ijt++) {
 
     AliEmcalJet *jetTrigMC = static_cast<AliEmcalJet*>(GetAcceptJetFromArray(ijt, typetMC));
@@ -438,7 +414,6 @@ void AliAnalysisTaskEmcalDiJetResponse::CorrelateTwoJets(const Int_t type) {
        fh1TriggersLostCharged->Fill(jetTrigPtMC);
       if(type==2)
        fh1TriggersLostFull->Fill(jetTrigPtMC);
-      
       continue;
     }
 
@@ -464,6 +439,13 @@ void AliAnalysisTaskEmcalDiJetResponse::CorrelateTwoJets(const Int_t type) {
       continue;
     }
 
+    if(fDoPtBias) {
+      if(type==0 || type==1) {
+       if(GetJetPt(jetAssocDet,typea)>GetJetPt(jetTrigDet,typet))
+         continue;
+      }
+    }
+
     FillDiJetResponse(jetTrigMC,jetAssocMC,jetTrigDet,jetAssocDet,type);