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

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

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetAna.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetAna.h
index 0340cf1e855d8791c4f28429c89f7fbd18654371..d407b11bdd085af99d51dff4b4ac868e68f06e88 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetAna.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalDiJetAna.h
@@ -8,7 +8,6 @@ class TH3F;
 class THnSparse;
 class TClonesArray;
 class TArrayI;
-class AliAnalysisUtils;
 class AliAnalysisManager;
 class AliGenPythiaEventHeader;
 
@@ -27,7 +26,9 @@ class AliAnalysisTaskEmcalDiJetAna : public AliAnalysisTaskEmcalDiJetBase {
 
   //Setters
   void                        SetMatchFullCharged(Bool_t b)        { fDoMatchFullCharged = b;}
-
+  void                        SetNKtBins(Int_t n)                  { fNKtBins = n;           }
+  void                        SetNDiJetEtaBins(Int_t n)            { fNDiJetEtaBins = n;     }
+  void                        SetNAjBins(Int_t n)                  { fNAjBins = n;           }
 
   //Getters
   Int_t                       GetPtTriggerBin(Double_t pt);
@@ -40,9 +41,11 @@ class AliAnalysisTaskEmcalDiJetAna : public AliAnalysisTaskEmcalDiJetBase {
   void                        CorrelateLeadingSubleadingJets(const Int_t type);
   AliEmcalJet                *GetLeadingJet(const Int_t type);
   AliEmcalJet                *GetLeadingAssociatedJet(const Int_t type, AliEmcalJet *jetTrig);
+  AliEmcalJet                *GetSecondLeadingAssociatedJet(const Int_t type, AliEmcalJet *jetTrig);
 
   Bool_t                      FillHistograms()   ;
   void                        FillDiJetHistos(const AliEmcalJet *jet1 = 0, const AliEmcalJet *jet2 = 0, const Int_t mode = 0);
+  void                        FillThreeJetHistos(const AliEmcalJet *jet1 = 0, const AliEmcalJet *jet2 = 0, const AliEmcalJet *jet3 = 0, const Int_t mode = 0);
   Bool_t                      RetrieveEventObjects();
 
   void                        FillMatchFullChargedHistos(Int_t cFull,Int_t cCharged);
@@ -50,6 +53,9 @@ class AliAnalysisTaskEmcalDiJetAna : public AliAnalysisTaskEmcalDiJetBase {
 
  private:
   Bool_t            fDoMatchFullCharged;                  //  do full-charged matching histos
+  Int_t             fNKtBins;                             // nbins on kT axis
+  Int_t             fNDiJetEtaBins;                       // nbins on dijet eta axis
+  Int_t             fNAjBins;                             // nbins on Aj axis
   TH2F             *fh2CentRhoCh;                         //! cent vs rho charged
   TH2F             *fh2CentRhoScaled;                     //! cent vs rho scaled
   TH3F             *fh3PtEtaPhiJetFull;                   //! pt,eta,phi of full jets
@@ -59,7 +65,6 @@ class AliAnalysisTaskEmcalDiJetAna : public AliAnalysisTaskEmcalDiJetBase {
   THnSparse        *fhnDiJetVarsCh;                       //! sparse with di-jet properties (charged-charged)
   THnSparse        *fhnDiJetVarsFullCharged;              //! sparse with di-jet properties (full-charged)
   THnSparse        *fhnMatchingFullCharged;               //! sparse comparing full with matched charged jet
-  TH3F             *fh3JetPtFullFractionDR;               //! full jet pt vs highest shared charged fraction vs DeltaR
 
   TH3F             *fh3DiJetKtNEFPtAssoc[4];              //! dijet kt vs NEF vs pTassoc for 4 trigger intervals
 
@@ -69,10 +74,18 @@ class AliAnalysisTaskEmcalDiJetAna : public AliAnalysisTaskEmcalDiJetBase {
   TH3F             *fAjPtAssocCentCh[4];                  //! Aj vs pT trigger assoc vs centrality
   TH3F             *fAjPtAssocCentFuCh[4];                //! Aj vs pT trigger assoc vs centrality
 
+  TH3F             *fh3PtTrigKt1Kt2Ch;                    //! ptTrig vs kT1 vs kT2 for 3-jet events
+  TH3F             *fh3PtTrigKt1Kt2FuCh;                  //! ptTrig vs kT1 vs kT2 for 3-jet events
+
+  TH3F             *fh3PtTrigDPhi1DPhi2Ch;                //! ptTrig vs DPhi12 vs DPhi13 for 3-jet events
+  TH3F             *fh3PtTrigDPhi1DPhi2FuCh;              //! ptTrig vs DPhi12 vs DPhi13 for 3-jet events
+
+  TH3F             *fh3PtAssoc1PtAssoc2DPhi23Ch[4];       //! ptAssoc1 vs ptAssoc2 vs DPhi23 for 3-jet events
+  TH3F             *fh3PtAssoc1PtAssoc2DPhi23FuCh[4];     //! ptAssoc1 vs ptAssoc2 vs DPhi23 for 3-jet events
 
   AliAnalysisTaskEmcalDiJetAna(const AliAnalysisTaskEmcalDiJetAna&);            // not implemented
   AliAnalysisTaskEmcalDiJetAna &operator=(const AliAnalysisTaskEmcalDiJetAna&); // not implemented
 
-  ClassDef(AliAnalysisTaskEmcalDiJetAna, 7) // dijet analysis task
+  ClassDef(AliAnalysisTaskEmcalDiJetAna, 11) // dijet analysis task
 };
 #endif