Index: trunk/MagicSoft/Mars/manalysis/MMcCalibrationCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MMcCalibrationCalc.cc	(revision 2821)
+++ trunk/MagicSoft/Mars/manalysis/MMcCalibrationCalc.cc	(revision 2825)
@@ -223,7 +223,11 @@
 	//
 
+
         const Float_t pedestrms  = sigpix.IsLoGainUsed()? 
-	  sqrt((Double_t)(fSignalCam->GetNumUsedLoGainFADCSlices())) * TMath::Max(0.01, fHeaderFadc->GetPedestalRmsLow(i)) : 
-	  sqrt((Double_t)(fSignalCam->GetNumUsedHiGainFADCSlices())) * TMath::Max(0.01, fHeaderFadc->GetPedestalRmsHigh(i));
+	  sqrt((Double_t)(fSignalCam->GetNumUsedLoGainFADCSlices())) * 
+	  (fHeaderFadc->GetPedestalRmsLow(i)>0.? fHeaderFadc->GetPedestalRmsLow(i): 0.01)
+	  : 
+	  sqrt((Double_t)(fSignalCam->GetNumUsedHiGainFADCSlices())) * 
+	  (fHeaderFadc->GetPedestalRmsHigh(i)>0.? fHeaderFadc->GetPedestalRmsHigh(i) : 0.01);
 
         calpix.SetPedestal(pedestmean, pedestrms);
