Merge branch 'master' of https://git.cern.ch/reps/AliRoot

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

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetResponse.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetResponse.h
index 8f1763c11421bc2b76c3d417e9b8964ce4d4294a..e292151f5b79f3283da9d76cf56fe64ffa44ea45 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetResponse.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetResponse.h
@@ -10,9 +10,7 @@ class TClonesArray;
 class TArrayI;
 class AliAnalysisUtils;
 class AliAnalysisManager;
-class AliGenPythiaEventHeader;
-
-#include "AliJetContainer.h"
+class AliJetContainer;
 
 #include "AliAnalysisTaskEmcalDiJetBase.h"
 
@@ -26,18 +24,23 @@ class AliAnalysisTaskEmcalDiJetResponse : public AliAnalysisTaskEmcalDiJetBase {
   void                        Terminate(Option_t *option);
 
   //Setters
-  void SetMatchFullCharged(Bool_t b)        { fDoMatchFullCharged = b;}
+  void SetMatchFullCharged(Bool_t b)        { fDoMatchFullCharged = b; }
+  void SetResponseVar(Int_t v)              { fnUsedResponseVar   = v; }    
 
   //Getters
 
  protected:
   Bool_t                      Run()              ;
   void                        CorrelateJets(const Int_t type);
-  Bool_t                      FillHistograms()   ;
+  void                        CorrelateAllJets(const Int_t type);
+  void                        CorrelateTwoJets(const Int_t type);
+
   void                        FillDiJetHistos(const AliEmcalJet *jet1 = 0, const AliEmcalJet *jet2 = 0, const Int_t mode = 0);
   void                        FillMatchHistos();
   Bool_t                      RetrieveEventObjects();
 
+  void                        FillDiJetResponse(const AliEmcalJet *jetTrigMC = 0, const AliEmcalJet *jetAssocMC = 0, const AliEmcalJet *jetTrigDet = 0, const AliEmcalJet *jetAssocDet = 0, Int_t type = 0);
+
  private:
   Bool_t            fDoMatchFullCharged;          //  do full-charged matching histos
   THnSparse        *fhnDiJetResponseCharged;      //! sparse with di-jet properties (full-full)
@@ -50,11 +53,12 @@ class AliAnalysisTaskEmcalDiJetResponse : public AliAnalysisTaskEmcalDiJetBase {
   TH3F             *fh3AssocLostPtDeltaPhiFull;   //! lost full associated jet
   THnSparse        *fhnMatchingCharged;           //! sparse comparing matched particle and detector level charged jets
   THnSparse        *fhnMatchingFull;              //! sparse comparing matched particle and detector level charged jets
+  Int_t             fnUsedResponseVar;            //  build response for kt (0) or dijet eta (1)
 
 
   AliAnalysisTaskEmcalDiJetResponse(const AliAnalysisTaskEmcalDiJetResponse&);            // not implemented
   AliAnalysisTaskEmcalDiJetResponse &operator=(const AliAnalysisTaskEmcalDiJetResponse&); // not implemented
 
-  ClassDef(AliAnalysisTaskEmcalDiJetResponse, 1) // jet sample analysis task
+  ClassDef(AliAnalysisTaskEmcalDiJetResponse, 2) // jet sample analysis task
 };
 #endif