Merge remote-tracking branch 'origin/master' into flatdev

[u/mrichter/AliRoot.git] / PWGHF / hfe / AliAnalysisTaskHFECal.h

diff --git a/PWGHF/hfe/AliAnalysisTaskHFECal.h b/PWGHF/hfe/AliAnalysisTaskHFECal.h
index aae83aa65ac2fcc33f3d04daf9801a889b8fe06e..1ec313efbaad180e6e6b7108201067e9951975ed 100644 (file)
--- a/PWGHF/hfe/AliAnalysisTaskHFECal.h
+++ b/PWGHF/hfe/AliAnalysisTaskHFECal.h
@@ -61,9 +61,7 @@ class AliAnalysisTaskHFECal : public AliAnalysisTaskSE {
   void SetQAHist (int qahist) {fqahist = qahist;};
   AliHFEpid *GetPID() const { return fPID; }
   void SetRejectKinkMother(Bool_t rejectKinkMother = kFALSE) { fRejectKinkMother = rejectKinkMother; };
-  void SelectPhotonicElectron(Int_t itrack, Double_t cent, AliESDtrack *track, Bool_t &fFlagPhotonicElec, Bool_t &fFlagConvinatElec, Double_t nSig, Double_t shower, Double_t ep, Double_t mce, Double_t w, Int_t ibgevent, Bool_t tagpi0, Bool_t tageta);
-  void SelectPhotonicElectron2(Int_t itrack, Double_t cent, AliESDtrack *track, Bool_t &fFlagPhotonicElec, Bool_t &fFlagConvinatElec, Double_t nSig, Double_t shower, Double_t ep, Double_t mce, Double_t w, Int_t ibgevent, Bool_t tagpi0, Bool_t tageta);
-  double SumpT(Int_t itrack, AliESDtrack *track);
+  void SelectPhotonicElectron(Int_t itrack, Double_t cent, AliESDtrack *track, Bool_t &fFlagPhotonic, Bool_t &fFlagConvinat, Double_t nSig, Double_t shower, Double_t ep, Double_t mce, Double_t w, Int_t ibgevent, Bool_t tagpi0, Bool_t tageta, Int_t iCal);
   void FindMother(TParticle* part, int &label, int &pid);
   double GetMCweight(double mcPi0pT);
   double GetMCweightEta(double mcEtapT);
@@ -135,8 +133,10 @@ class AliAnalysisTaskHFECal : public AliAnalysisTaskSE {
   TH1F                 *fPhotoElecPt;          //! photonic elec pt 
   TH2F                 *fPhoElecPt;            //! Pho inclusive ele pt
   TH2F                 *fPhoElecPtM20;         //! Pho inclusive ele pt
+  TH2F                 *fPhoElecPtM20Mass;             //! Pho inclusive ele pt
   TH2F                 *fSameElecPt;           //! Same inclusive ele pt
   TH2F                 *fSameElecPtM20;                //! Same inclusive ele pt
+  TH2F                 *fSameElecPtM20Mass;            //! Same inclusive ele pt
   TH2F                 *fSemiElecPtM20;                //! Same inclusive ele pt
 
   TH1F                 *fTrackPtBefTrkCuts;    //! Track pt before track cuts  
@@ -173,8 +173,10 @@ class AliAnalysisTaskHFECal : public AliAnalysisTaskSE {
  THnSparseD            *fIncpTMCM20pho;        //! MC HFE pid electron vs centrality
  THnSparseD            *fPhoElecPtMC;          //! Pho inclusive ele pt
  THnSparseD            *fPhoElecPtMCM20;               //! Pho inclusive ele pt
+ TH2D                  *fPhoElecPtMCM20Mass;           //! Pho inclusive ele pt
  THnSparseD            *fSameElecPtMC;         //! Same inclusive ele pt
  THnSparseD            *fSameElecPtMCM20;              //! Same inclusive ele pt
+ TH2D                  *fSameElecPtMCM20Mass;          //! Same inclusive ele pt
  THnSparseD            *fIncpTMCM20pho_pi0e;   //! MC HFE pid electron vs centrality
  THnSparseD            *fPhoElecPtMCM20_pi0e;          //! Pho inclusive ele pt
  THnSparseD            *fSameElecPtMCM20_pi0e;         //! Same inclusive ele pt
@@ -214,10 +216,11 @@ class AliAnalysisTaskHFECal : public AliAnalysisTaskSE {
  TH2D                   *fPhoVertexReco_Invmass;
  TH2D                   *fPhoVertexReco_step0;
  TH2D                   *fPhoVertexReco_step1;
- TH2D                   *fPhoVertexReco_step2;
- TH2D                   *fPhoVertexReco_step3;
- TH2D                   *fPhoVertexReco_step4;
- TH2D                   *fPhoVertexReco_step5;
+ TH1D                   *fMatchV0_0;
+ TH1D                   *fMatchV0_1;
+ TH1D                   *fMatchMC_0;
+ TH1D                   *fMatchMC_1;
+ TH2D                   *fpair;
 
  //<----- correction
  TGraphErrors           *fnSigEtaCorr[7];