Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.cc	(revision 7043)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.cc	(revision 7069)
@@ -71,4 +71,5 @@
 const TString MHCalibrationChargePINDiode::gsAbsHistXTitle     = "Time [FADC slices]";
 const TString MHCalibrationChargePINDiode::gsAbsHistYTitle     = "Nr. events";
+
 // --------------------------------------------------------------------------
 //
@@ -235,6 +236,5 @@
 {
 
-  MExtractedSignalPINDiode *extractor = (MExtractedSignalPINDiode*)par;
-  
+  const MExtractedSignalPINDiode *extractor = dynamic_cast<const MExtractedSignalPINDiode*>(par);
   if (!extractor)
     {
@@ -243,17 +243,8 @@
     }
   
-  Float_t slices = (Float_t)extractor->GetNumFADCSamples();
-  
-  if (slices == 0.)
-    {
-      *fLog << err << "Number of used signal slices in MExtractedSignalPINDiode is zero  ... abort." 
-            << endl;
-      return kFALSE;
-    }
-  
   const Float_t signal = (float)extractor->GetExtractedSignal();
   const Float_t time   = extractor->GetExtractedTime();
-  const Float_t sigma    = extractor->GetExtractedSigma();
-  const Float_t chi2    = extractor->GetExtractedChi2();
+  const Float_t sigma  = extractor->GetExtractedSigma();
+  const Float_t chi2   = extractor->GetExtractedChi2();
 
   if (time < 3. || time > 24.)