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

[u/mrichter/AliRoot.git] / MUON / AliMUONClusterFinderPeakFit.h

diff --git a/MUON/AliMUONClusterFinderPeakFit.h b/MUON/AliMUONClusterFinderPeakFit.h
index 118bb52b3e51fb4b0271c2473c52ed94b5786442..29d0232fd1390f05535e4889945bcff51253b6c5 100644 (file)
--- a/MUON/AliMUONClusterFinderPeakFit.h
+++ b/MUON/AliMUONClusterFinderPeakFit.h
@@ -25,7 +25,6 @@ class AliMUONMathieson;
 //class AliMUONPad;
 
 class TH2D;
-//class TClonesArray;
 
 class AliMUONClusterFinderPeakFit : public AliMUONVClusterFinder
 {
@@ -38,7 +37,7 @@ public:
 
   using AliMUONVClusterFinder::Prepare;
 
-  virtual Bool_t Prepare(Int_t detElemId, TClonesArray* pads[2],
+  virtual Bool_t Prepare(Int_t detElemId, TObjArray* pads[2],
                          const AliMpArea& area, const AliMpVSegmentation* seg[2]);
 
   virtual AliMUONCluster* NextCluster();
@@ -74,8 +73,8 @@ private:
   
   Int_t FindLocalMaxima(TObjArray *pixArray, Int_t *localMax, Double_t *maxVal); // find local maxima 
   void  FlagLocalMax(TH2D *hist, Int_t i, Int_t j, Int_t *isLocalMax); // flag local max
-  void  FindClusterCOG(AliMUONCluster& cluster, Int_t *localMax, Int_t iMax); // find cluster around local max with COG
-  void  FindClusterFit(AliMUONCluster& cluster, Int_t *localMax, Int_t *maxPos, Int_t nMax); // find cluster around local max with fitting
+  void  FindClusterCOG(AliMUONCluster& cluster, const Int_t *localMax, Int_t iMax); // find cluster around local max with COG
+  void  FindClusterFit(AliMUONCluster& cluster, const Int_t *localMax, const Int_t *maxPos, Int_t nMax); // find cluster around local max with fitting
   void  PadsInXandY(AliMUONCluster& cluster, Int_t &nInX, Int_t &nInY) const; // get number of pads in X and Y
 
   void CheckOverlaps();
@@ -106,7 +105,7 @@ private:
   Int_t fNMax; //!< number of local maxima
   TH2D *fHistAnode; //!< histo for local maxima search
   
-  const AliMpVSegmentation *fSegmentation[2]; //!< new segmentation
+  const AliMpVSegmentation *fkSegmentation[2]; //!< new segmentation
   
   TObjArray* fPixArray; //!< collection of pixels
   Int_t fDebug; //!< debug level