Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc	(revision 6828)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc	(revision 6857)
@@ -26,5 +26,5 @@
 // MHCalibrationTestCam                                                
 //                                                                        
-// Fills the calibrated signal from an MCerPhotEvt into 
+// Fills the calibrated signal from an MSignalCam into 
 // MHCalibrationPix for every:
 //
@@ -94,6 +94,6 @@
 #include "MCalibrationPix.h"
 
-#include "MCerPhotEvt.h"
-#include "MCerPhotPix.h"
+#include "MSignalCam.h"
+#include "MSignalPix.h"
 
 #include "MGeomCam.h"
@@ -155,5 +155,5 @@
 //
 // Searches pointer to:
-// - MCerPhotEvt
+// - MSignalCam
 //
 // Calls:
@@ -174,8 +174,8 @@
 
 
-  MCerPhotEvt *signal = (MCerPhotEvt*)pList->FindObject("MCerPhotEvt");
+  MSignalCam *signal = (MSignalCam*)pList->FindObject("MSignalCam");
   if (!signal)
   {
-      *fLog << err << "MCerPhotEvt not found... abort." << endl;
+      *fLog << err << "MSignalCam not found... abort." << endl;
       return kFALSE;
   }
@@ -199,5 +199,5 @@
 // -------------------------------------------------------------------------------
 //
-// Retrieves pointer to MCerPhotEvt:
+// Retrieves pointer to MSignalCam:
 //
 // Retrieves from MGeomCam:
@@ -208,10 +208,10 @@
 // Fills HiGain histograms (MHGausEvents::FillHistAndArray())
 // with:
-// - MCerPhotPix::GetNumPhotons(pixid);
+// - MSignalPix::GetNumPhotons(pixid);
 //
 Bool_t MHCalibrationTestCam::FillHists(const MParContainer *par, const Stat_t w)
 {
 
-  MCerPhotEvt *calibration = (MCerPhotEvt*)par;
+  MSignalCam *calibration = (MSignalCam*)par;
   if (!calibration)
     {
@@ -234,5 +234,5 @@
       MHCalibrationPix &histhi = (*this)[i];
 
-      const MCerPhotPix *pix = calibration->GetPixById(i);
+      const MSignalPix *pix = calibration->GetPixById(i);
       if (!pix)
         continue;