Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc	(revision 6857)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc	(revision 6858)
@@ -94,5 +94,6 @@
 #include "MCalibrationPix.h"
 
-#include "MArrivalTime.h"
+#include "MSignalCam.h"
+#include "MSignalPix.h"
 
 #include "MGeomCam.h"
@@ -116,4 +117,5 @@
 const TString MHCalibrationTestTimeCam::gsHistXTitle = "Arrival Time [FADC slices]";
 const TString MHCalibrationTestTimeCam::gsHistYTitle = "Nr. events";
+
 // --------------------------------------------------------------------------
 //
@@ -168,11 +170,4 @@
     return kFALSE;
 
-  MArrivalTime *signal = (MArrivalTime*)pList->FindObject("MArrivalTime");
-  if (!signal)
-  {
-      *fLog << err << "MArrivalTime not found... abort." << endl;
-      return kFALSE;
-  }
-
   const Int_t npixels  = fGeom->GetNumPixels();
   const Int_t nsectors = fGeom->GetNumSectors();
@@ -203,5 +198,5 @@
 {
 
-  MArrivalTime *calibration = (MArrivalTime*)par;
+  MSignalCam *calibration = (MSignalCam*)par;
   if (!calibration)
     {
@@ -227,5 +222,5 @@
 	continue;
 
-      const Float_t  time = (*calibration)[i];
+      const Float_t  time = (*calibration)[i].GetArrivalTime();
       const Int_t  aidx   = (*fGeom)[i].GetAidx();
       const Int_t  sector = (*fGeom)[i].GetSector();