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

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

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetTagger.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetTagger.h
index 8ac1656da2180f3893356fac251139d8ce8625e1..e3fac35f0693061a3552a5a2cac8e9c9c9f0e6f1 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetTagger.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetTagger.h
@@ -39,6 +39,11 @@ class AliAnalysisTaskEmcalJetTagger : public AliAnalysisTaskEmcalJet {
   void SetJetTaggingType(JetTaggingType t)                      { fJetTaggingType = t;}
   void SetJetTaggingMethod(JetTaggingMethod m)                  { fJetTaggingMethod = m;}
 
+  void SetMinFractionShared(Double_t f)                         { fMinFractionShared = f; }
+
+  //Getters
+  Double_t GetFractionSharedPt(const AliEmcalJet *jet1, const AliEmcalJet *jet2) const;
+
  protected:
   Bool_t                              RetrieveEventObjects();
   Bool_t                              Run();
@@ -48,9 +53,8 @@ class AliAnalysisTaskEmcalJetTagger : public AliAnalysisTaskEmcalJet {
   Double_t GetDeltaPhi(const AliEmcalJet* jet1, const AliEmcalJet* jet2);
   Double_t GetDeltaPhi(Double_t phi1,Double_t phi2);
   Double_t GetDeltaR(const AliEmcalJet* jet1, const AliEmcalJet* jet2) const;
-  Double_t GetFractionSharedPt(const AliEmcalJet *jet1, const AliEmcalJet *jet2) const;
 
-  void     MatchJetsGeo(Int_t c1 = -1, Int_t c2 = -1, Int_t iDebug = 0, Float_t maxDist = 0.3, Int_t type = 2);
+  void     MatchJetsGeo(Int_t c1 = -1, Int_t c2 = -1, Int_t iDebug = 0, Float_t maxDist = 0.3, Int_t type = 2, Bool_t bReset = kTRUE);
   void     ResetTagging(const Int_t c);
   
   JetTaggingType                      fJetTaggingType;             // jet matching type
@@ -58,16 +62,20 @@ class AliAnalysisTaskEmcalJetTagger : public AliAnalysisTaskEmcalJet {
 
   Int_t                               fContainerBase;              // jets to be tagged
   Int_t                               fContainerTag;               // jets used for tagging
+
+  Double_t                            fMinFractionShared;          // only fill histos for jets if shared fraction larger than X
   
  private:
   Bool_t            fMatchingDone;                // flag to indicate if matching is done or not
   TH3F            **fh3PtJet1VsDeltaEtaDeltaPhi;  //!pt jet 1 vs deta vs dphi
   TH2F            **fh2PtJet1VsDeltaR;            //!pt jet 1 vs dR
+  TH2F            **fh2PtJet2VsFraction;          //!pt jet 1 vs shared fraction
   
   TH2F            **fh2PtJet1VsLeadPtAllSel;      //!all jets after std selection
   TH2F            **fh2PtJet1VsLeadPtTagged;      //!tagged jets
   TH2F            **fh2PtJet1VsPtJet2;            //!pT of base jet vs tagged jet
-
+  TH2F            **fh2PtJet2VsRelPt;             //!pT of tagged jet vs pt base jet / pt tagged jet
+  
   TH3F             *fh3PtJetDEtaDPhiConst;        //!pt jet vs delta eta vs delta phi of constituents
   TH2F             *fh2PtJetDRConst;              //!pt jet vs delta R of constituents
   TH3F             *fh3PtJetAreaDRConst;          //!pt jet vs Area vs delta R of constituents
@@ -75,7 +83,7 @@ class AliAnalysisTaskEmcalJetTagger : public AliAnalysisTaskEmcalJet {
   AliAnalysisTaskEmcalJetTagger(const AliAnalysisTaskEmcalJetTagger&);            // not implemented
   AliAnalysisTaskEmcalJetTagger &operator=(const AliAnalysisTaskEmcalJetTagger&); // not implemented
 
-  ClassDef(AliAnalysisTaskEmcalJetTagger, 2)
+  ClassDef(AliAnalysisTaskEmcalJetTagger, 5)
 };
 #endif