Index: /trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/calibration.C	(revision 2630)
+++ /trunk/MagicSoft/Mars/macros/calibration.C	(revision 2631)
@@ -174,4 +174,5 @@
     MHCamera disp14  (geomcam, "MCalibrationCam;photons", "Nr. of Photons (Blind Pixel Method)");
     MHCamera disp15  (geomcam, "MCalibrationCam;convphot", "Conversion Factor (Blind Pixel Method)");
+    MHCamera disp16  (geomcam, "MCalibrationCam;sigma/charge", "Sigma per Charge");
 
     disp1.SetCamContent(*cam, 0);
@@ -199,5 +200,5 @@
     disp14.SetCamContent(*cam, 13);
     disp15.SetCamContent(*cam, 14);
-    //    disp16.SetCamError(*cam, 16);
+    disp16.SetCamContent(*cam, 15);
 
 
@@ -217,4 +218,5 @@
     disp14.SetYTitle("Nr Photons");
     disp15.SetYTitle("Conversion Factor [Ph/FADC count]");
+    disp16.SetYTitle("Sigma per Charge [1]");
 
     disp1.SetPrettyPalette();
@@ -231,4 +233,5 @@
     disp14.SetPrettyPalette();
     disp15.SetPrettyPalette();
+    disp16.SetPrettyPalette();
 
 
@@ -322,5 +325,5 @@
 
     TCanvas *c4 = &d2->AddTab("Reduced Charges");
-    c4->Divide(2,1);
+    c4->Divide(2,2);
 
     c4->cd(1);
@@ -330,4 +333,12 @@
 
     c4->cd(3);
+    obj->Draw();
+
+    c4->cd(2);
+    gStyle->SetOptStat(1111);
+    obj=disp16.DrawCopy("hist");
+    ((MHCamera*)obj)->AddNotify(*cam);
+
+    c4->cd(4);
     obj->Draw();
 
Index: /trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc	(revision 2630)
+++ /trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc	(revision 2631)
@@ -313,5 +313,4 @@
 	else
 	    mid  = pixel.GetIdxMaxHiGainSample();
-
 
 	MCalibrationPix &pix = (*fCalibrations)[pixid];
@@ -391,4 +390,5 @@
 {
 
+
   *fLog << inf << endl;
   *fLog << GetDescriptor() << " Cut Histogram Edges" << endl;
Index: /trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc	(revision 2630)
+++ /trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc	(revision 2631)
@@ -439,4 +439,7 @@
       val = (*this)[idx].GetRSigma();
       break;
+    case 15:
+      val = (*this)[idx].GetSigmaCharge()/(*this)[idx].GetCharge();
+      break;
     case 11:
       val = (*this)[idx].GetPheFFactorMethod();
Index: /trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc	(revision 2630)
+++ /trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc	(revision 2631)
@@ -60,5 +60,6 @@
       fPheFFactorMethod(-1.),
       fConversionFFactorMethod(-1.),
-      fHiGainSaturation(kFALSE)
+      fHiGainSaturation(kFALSE),
+      fLoGainPedRms(4.)
 {
 
@@ -137,6 +138,9 @@
   if ((fPed > 0.)  && (fPedRms > 0.))
     {
-      
-    fRSigma       = (fSigmaCharge*fSigmaCharge) - (fPedRms*fPedRms);
+
+      if (fHiGainSaturation)
+	fRSigma = (fSigmaCharge*fSigmaCharge) - (fLoGainPedRms*fLoGainPedRms);
+      else
+	fRSigma = (fSigmaCharge*fSigmaCharge) - (fPedRms*fPedRms);
 
     if (fRSigma > 0. )
Index: /trunk/MagicSoft/Mars/manalysis/MCalibrationPix.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCalibrationPix.h	(revision 2630)
+++ /trunk/MagicSoft/Mars/manalysis/MCalibrationPix.h	(revision 2631)
@@ -33,4 +33,6 @@
 
   Bool_t fHiGainSaturation;     // Is Lo-Gain used at all?
+
+  Float_t fLoGainPedRms;
 
   MHCalibrationPixel *fHist;    //! Pointer to the histograms performing the fits, etc.  
Index: /trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc	(revision 2630)
+++ /trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc	(revision 2631)
@@ -57,5 +57,5 @@
 //
 MExtractSignal::MExtractSignal(const char *name, const char *title)
-  : fSaturationLimit(250),
+  : fSaturationLimit(255),
     fConversionHiLo(10.)
 {
@@ -173,5 +173,5 @@
         UInt_t max  = pixel.GetMaxHiGainSample();
 
-	if (max < fSaturationLimit)  // take Hi Gain, no saturation
+	if (max <= fSaturationLimit)  // take Hi Gain, no saturation
 	  {
 	    sum = (float)pixel.GetSumHiGainSamples() - pedes*fNumHiGainSamples;