Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 8216)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 8217)
@@ -18,4 +18,10 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2006/12/04 Thomas Bretz
+
+   * mcalib/MCalibrationChargeCalc.cc:
+     - fixed a typo in a console message
+
+
 
  2006/11/16 Daniela Dorner
Index: /trunk/MagicSoft/Mars/NEWS
===================================================================
--- /trunk/MagicSoft/Mars/NEWS	(revision 8216)
+++ /trunk/MagicSoft/Mars/NEWS	(revision 8217)
@@ -182,7 +182,10 @@
      not be opened.
 
-   - callisto: In some rare cases it could happen that in the hi-gain
+   - callisto: In some rare cases it could happen that in the signal
      extraction of the digital filter the extractor returned nonsense
-     results due a wrong initializion of a variable
+     results due a wrong initializion of a variable (this happens in
+     cases in which the extracted signal is exactly zero or the
+     digital filter couldn't slide because of a too small extraction
+     window, which could happen in the lo-gain extraction)
 
    - callisto: The lo-gains have been marked as valid in some cases 
@@ -195,8 +198,14 @@
 
    - callisto: fixed a bug which caused the hi-gain saturation not
-     to be handled properly
+     to be handled properly in the spline (the position of the
+     saturation was calculated incorrectly)
 
    - callisto: fixed a bug which gave weird results if hi- _and_
-     lo-gain could not be extracted properly
+     lo-gain could not be extracted properly. In some cases hi-
+     and lo-gain have not been extracted at all and the random result
+     got calibrated. In other cases the hi-gain was saturating and the
+     lo-gain has not been extracted. For this a completly arbitraty
+     scale factor was applied to the result from extracting the
+     charge of the saturating hi-gain.
 
    - callisto: improves handling of extracted signal if lo- and/or
@@ -207,5 +216,6 @@
    - callisto: Fixed a problem in the spline extraction which gave
      weird results if the signal was extracted from the first (and
-     highest) slice
+     highest) slice (as a workaround extraction from the first
+     slice has been forbidden)
 
    - callisto: Fixed a bug regarding the use of the QE which doesn't
@@ -213,5 +223,5 @@
      (The bug was there since 14/07/2005)
 
-   - callisto: Changed the default for fgLoGainStartShift
+   - callisto: Changed the default for fgLoGainStartShift to -2.4
 
    - callisto: Fixed a bug which caused all hi-/lo-gain calibration
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 8216)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 8217)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.170 2006-10-23 12:27:21 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.171 2006-12-04 14:22:29 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -1066,5 +1066,5 @@
   if (!fExtractor)
     {
-      *fLog << err << "Extractor resolution has been chosen, but not extractor is set. Cannot calibrate." << endl;
+      *fLog << err << "Extractor resolution has been chosen, but no extractor is set. Cannot calibrate." << endl;
       return kFALSE;
     }