In AliMUONTriggerTrack: fixing memory leak

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

diff --git a/MUON/AliMUONClusterFinderMLEM.h b/MUON/AliMUONClusterFinderMLEM.h
index 4c25536d1081d4a30e1f4af36d2161c3651f3791..6267687d2daefdf064077284b09ff392803e8ddd 100644 (file)
--- a/MUON/AliMUONClusterFinderMLEM.h
+++ b/MUON/AliMUONClusterFinderMLEM.h
@@ -13,7 +13,6 @@
 //
 
 class TH2D;
-class TClonesArray;
 class TMinuit;
 
 #ifndef ROOT_TObjArray
@@ -35,11 +34,19 @@ public:
   AliMUONClusterFinderMLEM(Bool_t plot, AliMUONVClusterFinder* clusterFinder); // Constructor
   virtual ~AliMUONClusterFinderMLEM(); // Destructor
 
-  virtual Bool_t Prepare(const AliMpVSegmentation* segmentations[2],
-                         const AliMUONVDigitStore& digitStore);
+  virtual Bool_t NeedSegmentation() const { return kTRUE; }
+  
+  using AliMUONVClusterFinder::Prepare;
+
+  virtual Bool_t Prepare(Int_t detElemId,
+                         TObjArray* pads[2],
+                         const AliMpArea& area,
+                         const AliMpVSegmentation* segmentations[2]);
   
   virtual AliMUONCluster* NextCluster();
   
+  virtual void SetChargeHints(Double_t lowestPadCharge, Double_t lowestClusterCharge);
+  
   virtual void Print(Option_t* opt="") const;
 
   virtual void Paint(Option_t* opt="");
@@ -77,7 +84,8 @@ private:
   /// build array of pixels
   void BuildPixArray(AliMUONCluster& cluster); 
   void BuildPixArrayOneCathode(AliMUONCluster& cluster); 
-  void PadOverHist(Int_t idir, Int_t ix0, Int_t iy0, AliMUONPad *pad);
+  void PadOverHist(Int_t idir, Int_t ix0, Int_t iy0, AliMUONPad *pad,
+                  TH2D *hist1, TH2D *hist2);
 
   void RemovePixel(Int_t i);
   
@@ -85,14 +93,14 @@ private:
   
   Bool_t MainLoop(AliMUONCluster& cluster, Int_t iSimple); // repeat MLEM algorithm until pixels become sufficiently small
   
-  void   Mlem(AliMUONCluster& cluster, Double_t *coef, Double_t *probi, Int_t nIter); // use MLEM for cluster finding
+  void   Mlem(AliMUONCluster& cluster, const Double_t *coef, Double_t *probi, Int_t nIter); // use MLEM for cluster finding
   
-  void   FindCOG(TH2D *mlem, Double_t *xyc); // find COG position around maximum bin
-  Int_t  FindNearest(AliMUONPad *pixPtr0); // find nearest neighbouring pixel to the given one
+  void   FindCOG(Double_t *xyc); // find COG position around maximum bin
+  Int_t  FindNearest(const AliMUONPad *pixPtr0); // find nearest neighbouring pixel to the given one
 
   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  FindCluster(AliMUONCluster& cluster, Int_t *localMax, Int_t iMax); // find cluster around local max
+  void  FindCluster(AliMUONCluster& cluster, const Int_t *localMax, Int_t iMax); // find cluster around local max
   void  AddVirtualPad(AliMUONCluster& cluster); // add virtual pads for some clusters (if necessary)
   
   void  PadsInXandY(AliMUONCluster& cluster, Int_t &nInX, Int_t &nInY) const; // get number of pads in X and Y
@@ -119,7 +127,6 @@ private:
   static const Int_t fgkCoupled; ///< coupled pad  
       
   // Some constants
-  static const Double_t fgkZeroSuppression; ///< average zero suppression value
   static const Double_t fgkDistancePrecision; ///< used to check overlaps and so on
   static const TVector2 fgkIncreaseSize; ///< idem
   static const TVector2 fgkDecreaseSize; ///< idem
@@ -132,12 +139,14 @@ private:
   Int_t fDetElemId; //!< current DE being processed
   Int_t fClusterNumber; //!< current cluster number
   
-  const AliMpVSegmentation *fSegmentation[2]; //!< new segmentation
+  const AliMpVSegmentation *fkSegmentation[2]; //!< new segmentation
   
-  Int_t fCathBeg;               //!< starting cathode (for combined cluster / track reco)
-  Int_t fPadBeg[2];             //!< starting pads (for combined cluster / track reco)
+  //Int_t fCathBeg;               //!< starting cathode (for combined cluster / track reco)
+  //Int_t fPadBeg[2];             //!< starting pads (for combined cluster / track reco)
   
-  static     TMinuit* fgMinuit; //!< Fitter
+  //static     TMinuit* fgMinuit; //!< Fitter
+  TH2D *fHistMlem; //!< histogram for MLEM procedure
+  TH2D *fHistAnode; //!< histogram for local maxima search
   
   TObjArray* fPixArray; //!< collection of pixels
   Int_t fDebug; //!< debug level
@@ -147,6 +156,10 @@ private:
   Int_t fNClusters; //!< total number of clusters
   Int_t fNAddVirtualPads; //!< number of clusters for which we added virtual pads
   
+  Double_t fLowestPixelCharge; //!< see AliMUONRecoParam
+  Double_t fLowestPadCharge; //!< see AliMUONRecoParam
+  Double_t fLowestClusterCharge; //!< see AliMUONRecoParam
+  
   ClassDef(AliMUONClusterFinderMLEM,0) // cluster finder in MUON arm of ALICE
 };