Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc	(revision 8452)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc	(revision 8489)
@@ -230,19 +230,14 @@
     {
 
-      MHCalibrationPix &histhi = (*this)[i];
-
-      const MSignalPix *pix = calibration->GetPixById(i);
-      if (!pix)
-        continue;
-
-      const Float_t   signal = pix->GetNumPhotons();
-
+      const MSignalPix &pix = (*calibration)[i];
+
+      const Float_t signal = pix.GetNumPhotons();
       if (signal < 0.0001)
-        continue;
-      
+          continue;
+
       const Int_t aidx   = (*fGeom)[i].GetAidx();
       const Int_t sector = (*fGeom)[i].GetSector();
 
-      histhi.FillHistAndArray(signal) ;
+      (*this)[i].FillHistAndArray(signal);
 
       sumareahi  [aidx]   += signal;