Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5758)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5759)
@@ -29,4 +29,9 @@
      - stop program in case that multiple colours are found in same file
        without intensity calibration
+
+   * mbadpixels/MBadPixelsPix.h
+     - added two new possible UnCalibrated_t flags for the hi-lo 
+       calibration
+
 
  2005/01/10 Wolfgang Wittek
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h	(revision 5758)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h	(revision 5759)
@@ -50,5 +50,7 @@
       kConversionHiLoNotValid   = BIT(18),
       kHiGainOverFlow           = BIT(19),
-      kLoGainOverFlow           = BIT(20)
+      kLoGainOverFlow           = BIT(20),
+      kHiLoNotFitted            = BIT(21),
+      kHiLoOscillating          = BIT(22)
     };
     
Index: trunk/MagicSoft/TDAS-Extractor/Algorithms.tex
===================================================================
--- trunk/MagicSoft/TDAS-Extractor/Algorithms.tex	(revision 5758)
+++ trunk/MagicSoft/TDAS-Extractor/Algorithms.tex	(revision 5759)
@@ -264,7 +264,7 @@
   t = \frac{\sum_{i=0}^{windowsize} s_i \cdot i}{\sum_{i=0}^{windowsize} i} 
 \end{equation}
-where $i$ denotes the FADC slice index, starting from the beginning of the derived 
+where $i$ denotes the FADC slice index, starting from the beginning of the extraction
 window and running over the window and $s_i$ the clock-noise and 
-pedestal-corrected FADC value at slice index i. 
+pedestal-corrected FADC slice contents at slice position $i$. 
 \par
 The following free adjustable parameters have to be set from outside: 
@@ -276,13 +276,14 @@
 
 This extractor is implemented in the MARS-class {\textit{MExtractTimeAndChargeSpline}}.
-It uses a cubic spline algorithm, adapted from \cite{NUMREC}. 
+It interpolates the FADC contents using a cubic spline algorithm, adapted from \cite{NUMREC}. 
 The following free adjustable parameters have to be set from outside: 
 
 \begin{description}
-\item[Time Extraction Type:\xspace] The position of the maximum can be chosen (default) or the 
-position of the half maximum at the rising edge of the pulse
+\item[Time Extraction Type:\xspace] The position of the maximum can be chosen or the 
+position of the half maximum at the rising edge of the pulse (default).
 \item[Charge Extraction Type:\xspace] The amplitude of the maximum can be chosen (default) or the 
 integrated spline between maximum position minus rise time (default: 1.5 slices) and maximum position plus
-fall time (default: 4.5 slices). The low-gain signal integrates one slice more at the falling part of the 
+fall time (default: 4.5 slices). The low-gain signal integrates half a slice more at the rising
+falling part of the 
 signal.
 \item[Rise Time and Fall Time:\xspace] Can be adjusted for the integration charge extraction type.
@@ -618,3 +619,4 @@
 %%% TeX-master: "MAGIC_signal_reco"
 %%% TeX-master: "MAGIC_signal_reco"
+%%% TeX-master: "MAGIC_signal_reco"
 %%% End: