Merge branch 'feature-movesplit'

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

diff --git a/PWGGA/GammaConv/AliCaloPhotonCuts.h b/PWGGA/GammaConv/AliCaloPhotonCuts.h
index 297af106cc702e0a995491517ef68090528cdb91..80b329ef87591e3d83e98e7e4855d0ed5c2bf4bf 100644 (file)
--- a/PWGGA/GammaConv/AliCaloPhotonCuts.h
+++ b/PWGGA/GammaConv/AliCaloPhotonCuts.h
@@ -76,7 +76,7 @@ class AliCaloPhotonCuts : public AliAnalysisCuts {
                
                Bool_t                  InitializeCutsFromCutString(const TString analysisCutSelection);
                TString                 GetCutNumber();
-               Int_t                   GetClusterType()                                                                                                {return fClusterType; };
+        Int_t                  GetClusterType() {return fClusterType; }
                
                //Constructors
                AliCaloPhotonCuts(const char *name="ClusterCuts", const char * title="Cluster Cuts");
@@ -126,7 +126,7 @@ class AliCaloPhotonCuts : public AliAnalysisCuts {
                Bool_t                  SetNLM(Int_t);
                
        protected:
-               TList *fHistograms;
+        TList       *fHistograms;
                
                //cuts
                Int_t           fClusterType;                                           // which cluster do we have
@@ -140,7 +140,9 @@ class AliCaloPhotonCuts : public AliAnalysisCuts {
                Bool_t          fUseDistanceToBadChannel;                       // flag for switching on distance to bad channel cut
                Double_t        fMaxTimeDiff;                                           // maximum time difference to triggered collision
                Bool_t          fUseTimeDiff;                                           // flag for switching on time difference cut
-               Double_t        fMinDistTrackToCluster;                         // minimum distance between track and cluster
+        Double_t       fMaxDistTrackToClusterEta;                      // minimum distance between track and cluster in eta
+        Double_t       fMinDistTrackToClusterPhi;                      // minimum distance between track and cluster in phi
+        Double_t    fMaxDistTrackToClusterPhi;          // maximum distance between track and cluster in phi
                Bool_t          fUseDistTrackToCluster;                         // flag for switching on distance between track and cluster cut
                Bool_t          fExtendedMatching;                                      // flag for switching on extended matching histograms
                Double_t        fExoticCell;                                            // exotic cell cut
@@ -203,6 +205,14 @@ class AliCaloPhotonCuts : public AliAnalysisCuts {
         //Extended track matching histograms
         TH2F*          fHistClusterdEtadPhiPosTracksBeforeQA;  // 2-dim plot dEta vs. dPhi
         TH2F*          fHistClusterdEtadPhiNegTracksBeforeQA;  // 2-dim plot dEta vs. dPhi
+        TH2F*          fHistClusterdEtadPhiPosTracksAfterQA;   // 2-dim plot dEta vs. dPhi
+        TH2F*          fHistClusterdEtadPhiNegTracksAfterQA;   // 2-dim plot dEta vs. dPhi
+        TH2F*       fHistClusterdEtadPhiPosTracksP_000_075BeforeQA;// 2-dim plot dEta vs. dPhi, positive Tracks, P < 0.75
+        TH2F*       fHistClusterdEtadPhiPosTracksP_075_125BeforeQA;// 2-dim plot dEta vs. dPhi, positive Tracks, 0.75 < P < 1.25
+        TH2F*       fHistClusterdEtadPhiPosTracksP_125_999BeforeQA;// 2-dim plot dEta vs. dPhi, positive Tracks, P > 1.25
+        TH2F*       fHistClusterdEtadPhiNegTracksP_000_075BeforeQA;// 2-dim plot dEta vs. dPhi, negative Tracks, P < 0.75
+        TH2F*       fHistClusterdEtadPhiNegTracksP_075_125BeforeQA;// 2-dim plot dEta vs. dPhi, negative Tracks, 0.75 < P < 1.25
+        TH2F*       fHistClusterdEtadPhiNegTracksP_125_999BeforeQA;// 2-dim plot dEta vs. dPhi, negative Tracks, P > 1.25
         TH2F*          fHistClusterdEtadPtBeforeQA;                    // 2-dim plot dEta vs. Pt
         TH2F*          fHistClusterdPhidPtBeforeQA;                    // 2-dim plot dEta vs. Pt
         TH2F*          fHistClusterM20Pt_dPhiBeforeQA;                 // 2-dim plot M20 vs. Pt for given dPhi>0.05