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

[u/mrichter/AliRoot.git] / PWGGA / GammaConv / AliAnalysisTaskGammaCalo.h

diff --git a/PWGGA/GammaConv/AliAnalysisTaskGammaCalo.h b/PWGGA/GammaConv/AliAnalysisTaskGammaCalo.h
index 1145cf28e3738cdef8e3e5badf975f0913e55d93..55b2d0f5f6d8b34f4c5c8d9a2d158e2fb84ee2e9 100644 (file)
--- a/PWGGA/GammaConv/AliAnalysisTaskGammaCalo.h
+++ b/PWGGA/GammaConv/AliAnalysisTaskGammaCalo.h
@@ -81,7 +81,7 @@ class AliAnalysisTaskGammaCalo : public AliAnalysisTaskSE {
                // Additional functions for convenience
                void SetLogBinningXTH2(TH2* histoRebin);
                Int_t GetSourceClassification(Int_t daughter, Int_t pdgCode);
-       
+               
        protected:
                AliV0ReaderV1                                           *fV0Reader;                                                     // basic photon Selection Task
                AliGammaConversionAODBGHandler          **fBGHandler;                                           // BG handler for Conversion 
@@ -122,7 +122,7 @@ class AliAnalysisTaskGammaCalo : public AliAnalysisTaskSE {
 
                // histograms for rec photon clusters
                TH1F                                                            ** fHistoClusGammaPt;                           //! array of histos with cluster, pt
-                                                                               
+               TH1F                                                            ** fHistoClusOverlapHeadersGammaPt;     //! array of histos with cluster, pt overlapping with other headers
                //histograms for pure MC quantities
                TH1I                                                            **fHistoMCHeaders;                                      //! array of histos for header names
                TH1F                                                            **fHistoMCAllGammaPt;                           //! array of histos with all gamma, pT
@@ -190,7 +190,6 @@ class AliAnalysisTaskGammaCalo : public AliAnalysisTaskSE {
                TH2F                                                            **fHistoTruePrimaryPi0MCPtResolPt;                              //! array of histos with validated weighted primary pi0, MCpt, resol pt
                TH2F                                                            **fHistoTruePrimaryEtaMCPtResolPt;                              //! array of histos with validated weighted primary eta, MCpt, resol pt
                TH2F                                                            **fHistoTrueSecondaryPi0InvMassPt;                              //! array of histos with validated secondary mothers, invMass, pt
-               TH2F                                                            **fHistoTrueSecondaryEtaInvMassPt;                              //! array of histos with validated secondary mothers, invMass, pt
                TH2F                                                            **fHistoTrueSecondaryPi0FromK0sInvMassPt;               //! array of histos with validated secondary mothers from K0s, invMass, pt
                TH1F                                                            **fHistoTrueK0sWithPi0DaughterMCPt;                             //! array of histos with K0s with reconstructed pi0 as daughter, pt
                TH2F                                                            **fHistoTrueSecondaryPi0FromEtaInvMassPt;               //! array of histos with validated secondary mothers from eta, invMass, pt
@@ -256,6 +255,7 @@ class AliAnalysisTaskGammaCalo : public AliAnalysisTaskSE {
                Int_t                                                           fDoMesonQA;                                                     // flag for meson QA
                Int_t                                                           fDoClusterQA;                                           // flag for cluster QA
                Bool_t                                                          fIsFromMBHeader;                                        // flag for MC headers
+               Bool_t                                                          fIsOverlappingWithOtherHeader;          // flag for particles in MC overlapping between headers
                Bool_t                                                          fIsMC;                                                          // flag for MC information