Index: trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 8923)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 8957)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.70 2007-07-18 19:30:12 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.71 2008-06-14 15:55:51 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -558,10 +558,10 @@
                 // Correct for global shifts in light emission
                 // 
-                const MCalibrationChargePix &ugpix = (MCalibrationChargePix&)updatecam->GetAverageArea(0);
+                const MCalibrationChargePix &ugpix = static_cast<const MCalibrationChargePix&>(updatecam->GetAverageArea(0));
 
                 const Float_t globmean = avpix.GetConvertedMean();
                 calibUpdate = globmean==0 ? 1 : ugpix.GetConvertedMean()/globmean;
 
-                MBadPixelsPix &ubad  = (MBadPixelsPix&)updatecam->GetAverageBadArea(0);
+                const MBadPixelsPix &ubad  = static_cast<const MBadPixelsPix&>(updatecam->GetAverageBadArea(0));
                 if (ubad.IsUncalibrated(MBadPixelsPix::kChargeIsPedestal))
                   {
@@ -698,7 +698,7 @@
 // shall be calibrated, respectively. 
 //
-Int_t MCalibrateData::Calibrate(Bool_t data, Bool_t pedestal) const
-{
-    if (!data && !pedestal)
+Int_t MCalibrateData::Calibrate(Bool_t data, Bool_t doped) const
+{
+    if (!data && !doped)
         return kTRUE;
 
@@ -763,5 +763,5 @@
         } /* if (data) */
       
-        if (pedestal)
+        if (doped)
         {
             TIter NextPed(&fPedestalCams);
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationPulseTimeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationPulseTimeCam.cc	(revision 8923)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationPulseTimeCam.cc	(revision 8957)
@@ -199,8 +199,8 @@
   Float_t area = cam[idx].GetA();
 
- if (area == 0)
+  if (area == 0)
     return kFALSE;
 
- MCalibrationPix &pix = (MCalibrationPix&)(*this)[idx];
+  const MCalibrationPix &pix = static_cast<const MCalibrationPix&>((*this)[idx]);
 
   switch (type)