Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGLF / totEt / AliAnalysisEtSelectorPhos.h

diff --git a/PWGLF/totEt/AliAnalysisEtSelectorPhos.h b/PWGLF/totEt/AliAnalysisEtSelectorPhos.h
index 5f7f5eb4d5ac27486dbfd5e9547f0baf50ff06c5..92315988a2e0308fb15570199eb3b300c62eb67e 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtSelectorPhos.h
+++ b/PWGLF/totEt/AliAnalysisEtSelectorPhos.h
@@ -13,6 +13,7 @@ class TH2I;
 class TParticle;
 class AliPHOSGeometry;
 class AliESDEvent;
+class AliStack;
 
 class AliAnalysisEtSelectorPhos : public AliAnalysisEtSelector
 {
@@ -20,19 +21,24 @@ class AliAnalysisEtSelectorPhos : public AliAnalysisEtSelector
 public:
 
     AliAnalysisEtSelectorPhos(AliAnalysisEtCuts *cuts);
+    AliAnalysisEtSelectorPhos();
     virtual ~AliAnalysisEtSelectorPhos();
     
     virtual TRefArray* GetClusters();
-    virtual Bool_t CutMinEnergy(const AliESDCaloCluster& cluster) const;
-    virtual Bool_t CutMinEnergy(const TParticle& part) const;
-    virtual Bool_t CutDistanceToBadChannel(const AliESDCaloCluster& cluster) const;
-    virtual Bool_t CutTrackMatching(const AliESDCaloCluster& cluster) const;
-    virtual Bool_t CutGeometricalAcceptance(const TParticle& part) const;    
-    virtual Bool_t CutGeometricalAcceptance(const AliVTrack& part) const;    
+    virtual Bool_t PassMinEnergyCut(const AliESDCaloCluster& cluster) const;
+    virtual Bool_t PassMinEnergyCut(const TParticle& part) const;
+    virtual Bool_t PassMinEnergyCut(Double_t e) const;
+    virtual Bool_t PassDistanceToBadChannelCut(const AliESDCaloCluster& cluster) const;
+    virtual Bool_t PassTrackMatchingCut(const AliESDCaloCluster& cluster) const;
+    virtual Bool_t CutGeometricalAcceptance(const TParticle& part);    
+    virtual Bool_t CutGeometricalAcceptance(const AliVTrack& part);    
+    virtual Bool_t CutGeometricalAcceptance(const AliESDCaloCluster& cluster);    
     virtual void Init() {}
     virtual Int_t Init(const AliESDEvent *ev);
 
-    virtual void SetEvent(const AliESDEvent* event);
+    virtual Bool_t IsDetectorCluster(const AliESDCaloCluster& cluster) const {return cluster.IsPHOS();}
+
+     virtual UInt_t GetLabel(const AliESDCaloCluster *cluster, AliStack *stack);
     
 private:
 
@@ -40,16 +46,15 @@ private:
     int LoadGeometry(); // load geometry
     int LoadBadMaps(); // load bad maps
     
-    AliPHOSGeometry *fGeoUtils; // geo utils
+    AliPHOSGeometry *fGeoUtils; //! geo utils
     
-    TH2I *fBadMapM2; // Bad map
-    TH2I *fBadMapM3; // Bad map
-    TH2I *fBadMapM4; // Bad map
+    TH2I *fBadMapM2; //! Bad map
+    TH2I *fBadMapM3; //! Bad map
+    TH2I *fBadMapM4; //! Bad map
 
-    Bool_t fInitialized; // matrix initialized
     Bool_t fMatrixInitialized; // matrix initialized
     
-    AliAnalysisEtSelectorPhos();
+    //AliAnalysisEtSelectorPhos();
     AliAnalysisEtSelectorPhos(const AliAnalysisEtSelectorPhos& other); // Prohibited
     AliAnalysisEtSelectorPhos& operator=(const AliAnalysisEtSelectorPhos& other); // Prohibited
     bool operator==(const AliAnalysisEtSelectorPhos& other) const; // Prohibited