Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 6773)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 6774)
@@ -22,4 +22,7 @@
                                                  -*-*- END OF LINE -*-*-
  2005/03/07 Markus Gaug
+
+   * callisto.rc
+     - allow setting the variables ExtractWinLeft and ExtractWinRight.
 
    * mhcalib/MHCalibrationHiLoCam.h
Index: /trunk/MagicSoft/Mars/callisto.rc
===================================================================
--- /trunk/MagicSoft/Mars/callisto.rc	(revision 6773)
+++ /trunk/MagicSoft/Mars/callisto.rc	(revision 6774)
@@ -302,4 +302,6 @@
 # -------------------------------------------------------------------------
 #MJPedestalY2.PulsePosCheck: yes
+#MJPedestalY2.ExtractWinLeft:  2.5
+#MJPedestalY2.ExtractWinRight: 6.0
 #MJCalibrateSignal.ModifiedExtractWin: yes
 # -------------------------------------------------------------------------
@@ -309,4 +311,5 @@
 #MJPedestalY2.MHCalibrationPulseTimeCam.LowerSignalLimit: 100
 #MJPedestalY2.MHCalibrationPulseTimeCam.NumPixelsRequired: 2
+#MJPedestalY2.PixelCheck: no
 
 #MJPedestalY.ExtractPedestal: MPedCalcFromLoGain
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc	(revision 6773)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc	(revision 6774)
@@ -278,4 +278,5 @@
 		<< Form("%s%4.2f%s%4.2f","  Conv.FADC2Phe: ",pix->GetMeanConvFADC2Phe(),"+-",pix->GetMeanConvFADC2PheErr())
                 << " Saturated? :" << pix->IsHiGainSaturation() 
+		<< Form("%s%4.2f%s%4.2f","  Conv.HiLo: ",pix->GetConversionHiLo(),"+-",pix->GetConversionHiLoErr())
 		<< endl;
           id++;
Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc	(revision 6773)
+++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc	(revision 6774)
@@ -145,5 +145,5 @@
 using namespace std;
 
-const Byte_t  MHCalibrationPulseTimeCam::fgSaturationLimit   = 255;
+const Byte_t  MHCalibrationPulseTimeCam::fgSaturationLimit   = 254;
 const Byte_t  MHCalibrationPulseTimeCam::fgLowerSignalLimit  = 100;
 const Int_t   MHCalibrationPulseTimeCam::fgNumPixelsRequired = 2;