Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 4780)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 4781)
@@ -34,4 +34,9 @@
    * mjobs/MJPedestal.h
      - added function SetUseData() and IsUseData()
+
+   * mcalib/MCalibrationQEPix.cc
+     - changed initialization of fNorm... variables from 1. to -1. 
+       Like this, an accidental not-filling of MCalibrationQECam will
+       be recognized easier.
 
    * mcalib/MCalibrationChargeCalc.cc
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 4780)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 4781)
@@ -789,6 +789,10 @@
   const Float_t pedes  = ped.GetPedestal();
   const Float_t prms   = ped.GetPedestalRms();
-  const Float_t num    = TMath::Sqrt((Float_t)fPedestals->GetTotalEntries());
-
+  const Int_t   num    = fPedestals->GetTotalEntries();
+  
+  //
+  // RMS error set by PedCalcFromLoGain, 0 in case MPedCalcPedRun was used.
+  //
+  const Float_t prmserr = num>0 ? prms/TMath::Sqrt(2.*num) : ped.GetPedestalRmsError();
 
   //
@@ -797,14 +801,14 @@
   if (cal.IsHiGainSaturation())
     {
-      cal.SetPedestal(pedes* fNumLoGainSamples,
-                      prms * fSqrtLoGainSamples,
-                      prms * fNumLoGainSamples / num);
+      cal.SetPedestal(pedes   * fNumLoGainSamples,
+                      prms    * fSqrtLoGainSamples,
+                      prmserr * fSqrtLoGainSamples);
       cal.CalcLoGainPedestal((Float_t)fNumLoGainSamples, aidx);
     }
   else
     {
-      cal.SetPedestal(pedes* fNumHiGainSamples,
-                      prms * fSqrtHiGainSamples,
-                      prms * fNumHiGainSamples / num);
+      cal.SetPedestal(pedes   * fNumHiGainSamples,
+                      prms    * fSqrtHiGainSamples,
+                      prmserr * fSqrtHiGainSamples);
     }