Index: /trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/calibration.C	(revision 5345)
+++ /trunk/MagicSoft/Mars/macros/calibration.C	(revision 5346)
@@ -172,5 +172,5 @@
   //
   //  MExtractTimeHighestIntegral timeext;
-  //  MExtractTimeFastSpline timeext;
+  MExtractTimeFastSpline timeext;
   //  MExtractTimeSpline timeext;
   //
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc	(revision 5345)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc	(revision 5346)
@@ -62,5 +62,5 @@
 
 #include "MHCalibrationTestCam.h"
-#include "MHCalibrationTestPix.h"
+#include "MHCalibrationPix.h"
 
 #include "MCalibrationIntensityTestCam.h"
@@ -265,6 +265,6 @@
     {
       
-      MHCalibrationTestPix &hist = (MHCalibrationTestPix&)(*fTestCam)[i];
-      MCalibrationTestPix  &pix =  (MCalibrationTestPix &) (*testcam)[i];
+      MHCalibrationPix     &hist = (*fTestCam)[i];
+      MCalibrationTestPix  &pix =  (MCalibrationTestPix&)(*testcam)[i];
       //
       // We assume that the pixels have been interpolated so far. 
@@ -276,5 +276,4 @@
           continue;
         }
-      
 
       const Double_t nphot    = hist.GetMean();
@@ -394,5 +393,5 @@
     {
       
-      MHCalibrationTestPix &hist = (MHCalibrationTestPix&)(*fTestCam)[i];
+      MHCalibrationPix &hist    = (*fTestCam)[i];
       MCalibrationTestPix  &pix =  (MCalibrationTestPix&) (*testcam)[i];