Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 5192)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 5194)
@@ -910,5 +910,5 @@
                       prms    * fSqrtLoGainSamples,
                       prmserr * fSqrtLoGainSamples);
-      cal.CalcLoGainPedestal((Float_t)fNumLoGainSamples, aidx);
+      cal.CalcLoGainPedestal((Float_t)fNumLoGainSamples);
     }
   else
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc	(revision 5192)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc	(revision 5194)
@@ -81,9 +81,8 @@
 using namespace std;
 
-const Float_t MCalibrationChargePix::gkElectronicPedRmsInner    = 1.5;
-const Float_t MCalibrationChargePix::gkElectronicPedRmsOuter    = 1.8;
-const Float_t MCalibrationChargePix::gkElectronicPedRmsErr      = 0.35;
-const Float_t MCalibrationChargePix::gkFFactor                  = 1.15;
-const Float_t MCalibrationChargePix::gkFFactorErr               = 0.02;
+const Float_t MCalibrationChargePix::gkElectronicPedRms    = 0.8;
+const Float_t MCalibrationChargePix::gkElectronicPedRmsErr = 0.1;
+const Float_t MCalibrationChargePix::gkFFactor             = 1.15;
+const Float_t MCalibrationChargePix::gkFFactorErr          = 0.02;
 
 const Float_t MCalibrationChargePix::fgConversionHiLo           = 10.;
@@ -244,17 +243,9 @@
 //
 // Get the relative variance of the electronics pedestal RMS
-// - If aidx is 0, return rel. variance of gkElectronicPedRmsInner
-// - If aidx is 1, return rel. variance of gkElectronicPedRmsOuter
-//
-const Float_t MCalibrationChargePix::GetElectronicPedRmsRelVar(const Int_t aidx) const 
-{
-
-  if (aidx == 0)
-    return gkElectronicPedRmsErr * gkElectronicPedRmsErr / gkElectronicPedRmsInner / gkElectronicPedRmsInner;
-
-  if (aidx == 1)
-    return gkElectronicPedRmsErr * gkElectronicPedRmsErr / gkElectronicPedRmsOuter / gkElectronicPedRmsOuter;
-
-  return -1.;
+// - returns rel. variance of gkElectronicPedRms
+//
+const Float_t MCalibrationChargePix::GetElectronicPedRmsRelVar() const 
+{
+  return gkElectronicPedRmsErr * gkElectronicPedRmsErr / gkElectronicPedRms / gkElectronicPedRms;
 }
  
@@ -1006,5 +997,5 @@
 //   Var (Low Gain Ped RMS Square) = Var(LoGain NSB square) + Var(elec.ped. square)
 //
-void MCalibrationChargePix::CalcLoGainPedestal(Float_t logainsamples, const Int_t aidx)
+void MCalibrationChargePix::CalcLoGainPedestal(Float_t logainsamples)
 {
 
@@ -1015,7 +1006,6 @@
     return;
 
-  const Float_t elecPedRms     = (aidx == 0 ? gkElectronicPedRmsInner : gkElectronicPedRmsOuter ) 
-                               * TMath::Sqrt(logainsamples) / fConversionHiLo;
-  const Float_t elecPedRmsVar  = ( GetElectronicPedRmsRelVar(aidx) + GetConversionHiLoRelVar() )
+  const Float_t elecPedRms     = gkElectronicPedRms * TMath::Sqrt(logainsamples) / fConversionHiLo;
+  const Float_t elecPedRmsVar  = ( GetElectronicPedRmsRelVar() + GetConversionHiLoRelVar() )
                                * elecPedRms * elecPedRms;
   
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h	(revision 5192)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h	(revision 5194)
@@ -10,9 +10,8 @@
 private:
 
-  static const Float_t gkElectronicPedRmsInner;  //! Electronic component of ped. RMS (now set to: 1.5)
-  static const Float_t gkElectronicPedRmsOuter;  //! Electronic component of ped. RMS (now set to: 1.8)
-  static const Float_t gkElectronicPedRmsErr;    //! Error Electr. component ped. RMS (now set to: 0.35)
-  static const Float_t gkFFactor;                //! Laboratory F-factor PMTs         (now set to: 1.15)
-  static const Float_t gkFFactorErr;             //! Laboratory F-factor Error PMTs   (now set to: 0.02)
+  static const Float_t gkElectronicPedRms;     //! Electronic component of ped. RMS from opt. receiver on (now set to: 0.8)
+  static const Float_t gkElectronicPedRmsErr;  //! Error Electr. component ped. RMS (now set to: 0.1)
+  static const Float_t gkFFactor;              //! Laboratory F-factor PMTs         (now set to: 1.15)
+  static const Float_t gkFFactorErr;           //! Laboratory F-factor Error PMTs   (now set to: 0.02)
 
   static const Float_t fgConversionHiLo;         //! Default fConversionHiLo          (now set to: 10.)
@@ -45,5 +44,5 @@
   enum  { kFFactorMethodValid   };          // Possible bits to be set
 
-  const Float_t GetElectronicPedRmsRelVar(const Int_t aidx) const;
+  const Float_t GetElectronicPedRmsRelVar() const;
   const Float_t GetConversionHiLoRelVar()  const;
   const Float_t GetFFactorRelVar()     const;
@@ -108,5 +107,5 @@
 
   // Calculations
-  void   CalcLoGainPedestal       ( const Float_t logainsamples, const Int_t aidx );
+  void   CalcLoGainPedestal       ( const Float_t logainsamples);
   Bool_t CalcReducedSigma  (  );
   Bool_t CalcFFactor       (  );