Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc	(revision 8364)
+++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc	(revision 8365)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.54 2007-03-03 22:00:25 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.55 2007-03-04 14:46:44 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -154,13 +154,11 @@
 #include "MBadPixelsPix.h"
 
-#include "MRawEvtData.h"
 #include "MRawRunHeader.h"
 #include "MRawEvtPixelIter.h"
 
+#include "MPedestalSubtractedEvt.h"
+
 #include "MExtractedSignalCam.h"
 #include "MExtractedSignalPix.h"
-
-#include "MArrayI.h"
-#include "MArrayD.h"
 
 ClassImp(MHCalibrationChargeCam);
@@ -328,13 +326,12 @@
 Bool_t MHCalibrationChargeCam::SetupHists(const MParList *pList)
 {
-
-  fRawEvt = (MRawEvtData*)pList->FindObject("MRawEvtData");
-  if (!fRawEvt)
-  {
-      *fLog << err << dbginf << "MRawEvtData not found... aborting." << endl;
-      return kFALSE;
-  }
-
-  return kTRUE;
+    fRawEvt = (MPedestalSubtractedEvt*)pList->FindObject("MPedestalSubtractedEvt");
+    if (!fRawEvt)
+    {
+        *fLog << err << dbginf << "MPedestalSubtractedEvt not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    return kTRUE;
 }
 
@@ -754,16 +751,13 @@
   }
 
-  MRawEvtPixelIter pixel(fRawEvt);
-  while (pixel.Next())
+  const Int_t npix = fRawEvt->GetNumPixels();
+  const Int_t nhi  = fRunHeader->GetNumSamplesHiGain();
+  for (int pixid=0; pixid<npix; pixid++)
   {
-      const UInt_t pixid = pixel.GetPixelId();
-
       MHCalibrationChargePix &histhi = (MHCalibrationChargePix&)(*this)[pixid];
-
       if (histhi.IsExcluded())
          continue;
-      
-      const Float_t timehi = (Float_t)pixel.GetIdxMaxHiGainSample(hifirst, hilast);
-
+
+      const Float_t timehi = fRawEvt->GetMax(pixid, hifirst, hilast)+hifirst;
       histhi.FillAbsTime(timehi);
 
@@ -778,5 +772,5 @@
           MHCalibrationChargePix &histlo = (MHCalibrationChargePix&)(*this)(pixid);
 
-          const Float_t timelo = (Float_t)pixel.GetIdxMaxLoGainSample(lofirst, lolast);
+          const Float_t timelo = fRawEvt->GetMax(pixid, nhi+lofirst, nhi+lolast)+lofirst;
           histlo.FillAbsTime(timelo);
 
@@ -785,5 +779,5 @@
         }
   }
-  
+
   for (UInt_t j=0; j<nareas; j++)
     {
@@ -795,5 +789,4 @@
 
       MHCalibrationChargePix &hipix = (MHCalibrationChargePix&)GetAverageHiGainArea(j);
-      
 
       if (IsOscillations())