Index: trunk/MagicSoft/TDAS-Extractor/Algorithms.tex
===================================================================
--- trunk/MagicSoft/TDAS-Extractor/Algorithms.tex	(revision 5249)
+++ trunk/MagicSoft/TDAS-Extractor/Algorithms.tex	(revision 5251)
@@ -8,29 +8,156 @@
 {\it Missing coding: 
 \begin{itemize}
-\item Implementing the AB-flag for all extractors \ldots Markus
 \item Implementing a low-gain extraction based on the high-gain information \ldots Arnau
-\item Joining the Sliding Window and Highest Integral extractor into one \ldots Markus
 \item Real fit to the expected pulse shape \ldots Hendrik, Wolfgang ???
 \end{itemize}
 }
 
+\subsection{Pure signal extractors}
 
-\subsection{Pure signal extractors}
+The pure signal extractors have in common that they compute only the 
+signal, but no arrival time. All treated extractors here derive from the MARS-base
+class {\textit{MExtractor}} which provides the following facilities:
+
+\begin{itemize}
+\item The global extraction limits can be set from outside
+\item FADC saturation is kept track off
+\end{itemize}
+
+The following free adjustable parameters have to be set from outside: 
+\begin{description}
+\item[Global extraction limits:\xspace] Limits in between the extractor is allowed 
+to search. 
+\end{description}
+
 \subsubsection{Fixed Window}
-\subsubsection{Fixed Window Peak Search}
-\subsubsection{Fixed Window with integrated spline}
 
-\subsection{Pure time extractors}
-\subsubsection{Highest Integral}
+This extractor is implemented in the MARS-class {\textit{MExtractFixedWindow}}.
+It simply adds the FADC contents in the allowed ranges. 
+As it does not correct for the clock-noise, only an even number of samples is allowed.
+
+\subsubsection{Fixed Window with global Peak Search}
+
+This extractor is implemented in the MARS-class {\textit{MExtractFixedWindowPeakSearch}}.
+It first fixes a reference point defined as the highest sum of 
+consecutive non-saturating FADC slices in a (smaller) peak-search window. This reference 
+point removes the coherent movement of the arrival times over whole camera due to the trigger jitter.
+
+Then, simply adds the FADC contents around the reference point in a fixed window manner.
+It loops twice over the all pixels every event, because it first has to find the reference point. 
+As it does not correct for the clock-noise, only an even number of samples is allowed.
+
+The following free adjustable parameters have to be set from outside: 
+\begin{description}
+\item[Peak Search Window:\xspace] Defines the ``sliding window'' in which the peaking sum is 
+searched for (default: 4 slices)
+\item[Offset from Window:\xspace] Defines the offset from the found reference point to start 
+extracting the fixed window (default: 1 slice)
+\item[Low-Gain Peak shift:\xspace] Defines the shift in the low-gain with respect to the peak found 
+in the high-gain (default: 1 slice)
+\end{description}
+
+\subsubsection{Fixed Window with integrated cubic spline}
+
+This extractor is implemented in the MARS-class {\textit{MExtractFixedWindowSpline}}.
+It uses a cubic spline algorithm, adapted from \cite{NumRec}. It integrated the 
+spline interpolated FADC slice values, counting the edge slices as half.
+As it does not correct for the clock-noise, only an odd number of samples is allowed.
 
 \subsection{Combined extractors}
-\subsubsection{Sliding Window with Highest Integral}
+
+The combined extractors have in common that they compute the arrival time and 
+the signal in one step. All treated combined extractors here derive from the MARS-base
+class {\textit{MExtractTimeAndCharge}} which provides the following facilities:
+
+\begin{itemize}
+\item Only one loop over all pixels is performed
+\item The individual FADC slice values get the clock-noise-corrected pedestals immediately subtracted.
+\item The low-gain extraction range is adapted dynamically, based on the computed arrival time 
+    from the high-gain samples
+\item Extracted times from the low-gain samples get corrected for the intrinsic time delay of the low-gain
+    pulse
+\item The global extraction limits can be set from outside
+\item FADC saturation is kept track off
+\end{itemize}
+
+The following free adjustable parameters have to be set from outside: 
+\begin{description}
+\item[Global extraction limits:\xspace] Limits in between the extractor is allowed 
+to search. They are fixed by the extractor for the high-gain, but re-adjusted for 
+every event in the low-gain, depending on the arrival time found in the low-gain. 
+However, the dynamically adjusted window is not allowed to pass beyond the global 
+limits.
+\item[Low-gain start shift:\xspace] Global shift between the computed high-gain arrival
+time and the start of the low-gain extraction limit (corrected for the intrinsic time offset). 
+This variable tells where the extractor is allowed to start searching for the low-gain signal 
+if the high-gain arrival time is known. It avoids that the extractor gets confused by possible high-gain 
+signals leaking into the ``low-gain'' region.
+\end{description}
+
+\subsubsection{Sliding Window with amplitude-weighted time}
+
+This extractor is implemented in the MARS-class {\textit{MExtractTimeAndChargeSlidingWindow}}.
+It extracts the signal from a sliding window of an adjustable size, for high-gain and low-gain 
+individually (default: 6 and 6) The signal is the one which maximizes the summed 
+(clock-noise and pedestal-corrected) FADC signal over the window.
+\par
+The amplitude-weighted arrival time is calculated from the window with 
+the highest integral using the following formula:
+
+\begin{equation}
+  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 
+window and running over the window and $s_i$ the clock-noise and 
+pedestal-corrected FADC value at slice index i. 
+\par
+The following free adjustable parameters have to be set from outside: 
+\begin{description}
+\item[Window sizes:\xspace] Independenty for high-gain and low-gain (default: 6,6)
+\end{description}
+
+\subsubsection{Cubic Spline with Sliding Window or Amplitude extraction}
+
+This extractor is implemented in the MARS-class {\textit{MExtractTimeAndChargeSpline}}.
+It uses 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[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 
+signal.
+\item[Rise Time and Fall Time:\xspace] Can be adjusted for the integration charge extraction type.
+\item[Resolution:\xspace] Defined as the maximum allowed difference between the calculated half maximum value and 
+the computed spline value at the arrival time position. Can be adjusted for the half-maximum time extraction 
+type.
+\end{description}
+
 \subsubsection{Digital Filter}
-\subsubsection{(Fast) Spline with Amplitude extraction}
-\subsubsection{Real fit to the expected pulse shape \newline
-\newline
-}
 
-%References: \cite{OF77} \cite{OF94}.
+This extractor is implemented in the MARS-class {\textit{MExtractTimeAndChargeDigitalFilter}}.
+
+\ldots {\it Hendrik ... }
+
+The following free adjustable parameters have to be set from outside: 
+
+\begin{description}
+\item[Weights File:\xspace] 
+\item[Window Sizes:\xspace]
+\item[Binning Resolution:\xspace]
+\end{description}
+
+\subsubsection{Real fit to the expected pulse shape }
+
+This extractor is not yet implemented as MARS-class...
+\par
+It fit the pulse shape to a Landau convoluted with a Gaussian using the following 
+parameters:...
+
+\ldots {\it Hendrik, Wolfgang ... }
+
+%References: \cite{OF77} \cite{OF94} \cite{NumRec}.
 
 
Index: trunk/MagicSoft/TDAS-Extractor/bibfile.bib
===================================================================
--- trunk/MagicSoft/TDAS-Extractor/bibfile.bib	(revision 5249)
+++ trunk/MagicSoft/TDAS-Extractor/bibfile.bib	(revision 5251)
@@ -17,5 +17,5 @@
 
 @Book{NumRec,
-  author =   "W.H.Press, S.A.Teukolsky, W.T.Vetterling, B.P.Flannery",
+  author =   "W.H.Press and  S.A.Teukolsky and  W.T.Vetterling and  B.P.Flannery",
   title =    "Numerical Recipes in C++, 2nd edition"
   publisher = "Cambridge University Press",
