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

[u/mrichter/AliRoot.git] / MUON / AliMUONClusterSplitterMLEM.cxx

diff --git a/MUON/AliMUONClusterSplitterMLEM.cxx b/MUON/AliMUONClusterSplitterMLEM.cxx
index 53ba85dab3e6783992d1b58698410ad487a6107e..ee383022c16aa3c59a5011fd369ff3d4f1d55744 100644 (file)
--- a/MUON/AliMUONClusterSplitterMLEM.cxx
+++ b/MUON/AliMUONClusterSplitterMLEM.cxx
@@ -48,6 +48,8 @@
 #include <TRandom.h>
 #include <Riostream.h>
 
+using std::endl;
+using std::cout;
 /// \cond CLASSIMP
 ClassImp(AliMUONClusterSplitterMLEM)
 /// \endcond
@@ -114,7 +116,7 @@ AliMUONClusterSplitterMLEM::AddBin(TH2 *mlem,
   
   Int_t nx = mlem->GetNbinsX();
   Int_t ny = mlem->GetNbinsY();
-  Double_t cont1, cont = mlem->GetCellContent(jc,ic);
+  Double_t cont1, cont = mlem->GetBinContent(mlem->GetBin(jc,ic));
   AliMUONPad *pixPtr = 0;
   
   Int_t ie = TMath::Min(ic+1,ny), je = TMath::Min(jc+1,nx);
@@ -122,7 +124,7 @@ AliMUONClusterSplitterMLEM::AddBin(TH2 *mlem,
     for (Int_t j = TMath::Max(jc-1,1); j <= je; ++j) {
       if (i != ic && j != jc) continue;
       if (used[(i-1)*nx+j-1]) continue;
-      cont1 = mlem->GetCellContent(j,i);
+      cont1 = mlem->GetBinContent(mlem->GetBin(j,i));
       if (mode && cont1 > cont) continue;
       used[(i-1)*nx+j-1] = kTRUE;
       if (cont1 < fLowestPixelCharge) continue;
@@ -234,7 +236,7 @@ AliMUONClusterSplitterMLEM::Fcn1(const AliMUONCluster& cluster,
     chi2 += delta;
   } // for (Int_t j=0;
   if (iflag == 0 && npads) qAver = qTot / npads;
-  if (!npads)
+  if (!npads && iflag==0)
   {
     AliError(Form("Got npads=0. Please check"));
   }
@@ -825,7 +827,7 @@ AliMUONClusterSplitterMLEM::Split(const AliMUONCluster& cluster,
     {
       indx = (i-1)*nx + j - 1;
       if (used[indx]) continue;
-      cont = mlem->GetCellContent(j,i);
+      cont = mlem->GetBinContent(mlem->GetBin(j,i));
       if (cont < fLowestPixelCharge) continue;
       pix = new TObjArray(20);
       used[indx] = 1;