Index: trunk/MagicSoft/TDAS-Extractor/Algorithms.tex
===================================================================
--- trunk/MagicSoft/TDAS-Extractor/Algorithms.tex	(revision 5992)
+++ trunk/MagicSoft/TDAS-Extractor/Algorithms.tex	(revision 5993)
@@ -467,6 +467,6 @@
 \end{equation}
 
-For the MAGIC signals, as implemented in the MC simulations, a pedestal RMS of a single FADC slice of 4 FADC counts introduces an error in the reconstructed signal and time of:
-
+For the MAGIC signals, as implemented in the MC simulations, a pedestal RMS of a single FADC slice of 4 FADC counts introduces an error in the 
+reconstructed signal and time of:
 
 \begin{equation}\label{of_noise}
@@ -474,14 +474,29 @@
 \end{equation}
 
+\par
+\ldots {\textit{\bf CALCULATE THESE NUMBERS FOR 6 SLICES! }} \ldots
+\par
+
 where $\Delta T_{\mathrm{FADC}} = 3.33$ ns is the sampling interval of the MAGIC FADCs.
 
 
-For an IACT there are two types of background noise. On the one hand there is the constantly present electronics noise, on the other hand the light of the night sky introduces a sizeable background noise to the measurement of Cherenkov photons from air showers.
-
-The electronics noise is largely white, uncorrelated in time. The noise from the night sky background photons is the superposition of the detector response to single photo electrons arriving randomly distributed in time. Figure \ref{fig:noise_autocorr_AB_36038_TDAS} shows the noise autocorrelation matrix for an open camera. The large noise autocorrelation in time of the current FADC system is due to the pulse shaping with a shaping constant of 6 ns. 
-
-In general the amplitude and timing weights, $\boldsymbol{w}_{\text{amp}}$ and $\boldsymbol{w}_{\text{time}}$, depend on the pulse shape, the derivative of the pulse shape and the noise autocorrelation. In the high gain samples the correlated night sky background noise dominates over the white electronics noise. Thus different noise levels just cause the noise autocorrelation matrix $\boldsymbol{B}$ to change by a factor, which cancels out in the weights calculation. Thus in the high gain the weights are to a very good approximation independent of the night sky background noise level.
+For an IACT there are two types of background noise. On the one hand, there is the constantly present electronics noise, 
+on the other hand, the light of the night sky introduces a sizeable background noise to the measurement of Cherenkov photons from air showers.
+
+The electronics noise is largely white, uncorrelated in time. The noise from the night sky background photons is the superposition of the 
+detector response to single photo electrons following a Poisson distribution in time. Figure \ref{fig:noise_autocorr_AB_36038_TDAS} shows the noise 
+autocorrelation matrix for an open camera. The large noise autocorrelation in time of the current FADC system is due to the pulse shaping with a 
+shaping constant of 6 ns. 
+
+In general, the amplitude and time weights, $\boldsymbol{w}_{\text{amp}}$ and $\boldsymbol{w}_{\text{time}}$, depend on the pulse shape, the 
+derivative of the pulse shape and the noise autocorrelation. In the high gain samples the correlated night sky background noise dominates over 
+the white electronics noise. Thus different noise levels just cause the noise autocorrelation matrix $\boldsymbol{B}$ to change by a same factor, 
+which cancels out in the weights calculation. Thus in the high gain the weights are to a very good approximation independent of the night 
+sky background noise level.
 
 Contrary to that in the low gain samples ... .
+\ldots 
+\ldots {\textit{\bf SITUATION FOR LOW-GAIN SAMPLES! }} \ldots
+\par
 
 
@@ -497,5 +512,11 @@
 
 Using the average reconstructed pulpo pulse shape, as shown in figure \ref{fig:pulpo_shape_low}, and the 
-reconstructed noise autocorrelation matrix from a pedestal run with random triggers, the digital filter 
+reconstructed noise autocorrelation matrix from a pedestal run 
+
+\par
+\ldots {\textit{\bf WHICH RUN (RUN NUMBER, WHICH NSB?, WHICH PIXELS ??}} \ldots
+\par
+
+with random triggers, the digital filter 
 weights are computed. Figures \ref{fig:w_time_MC_input_TDAS} and \ref{fig:w_amp_MC_input_TDAS} show the 
 parameterization of the amplitude and timing weights for the MC pulse shape as a function of the ...
@@ -509,5 +530,8 @@
 \includegraphics[totalheight=7cm]{w_time_MC_input_TDAS.eps}
 \end{center}
-\caption[Time weights.]{Time weights $w_{\mathrm{time}}(t_0) \ldots w_{\mathrm{time}}(t_5)$ for a window size of 6 FADC slices for the pulse shape used in the MC simulations. The first weight $w_{\mathrm{time}}(t_0)$ is plotted as a function of the relative time $t_{\text{rel}}$ the trigger and the FADC clock in the range $[-0.5;0.5[ \ T_{\text{ADC}}$, the second weight in the range $[0.5;1.5[ \ T_{\text{ADC}}$ and so on. A binning resolution of $0.1  T_{\text{ADC}}$ has been chosen.} \label{fig:w_time_MC_input_TDAS}
+\caption[Time weights.]{Time weights $w_{\mathrm{time}}(t_0) \ldots w_{\mathrm{time}}(t_5)$ for a window size of 6 FADC slices for the pulse shape 
+used in the MC simulations. The first weight $w_{\mathrm{time}}(t_0)$ is plotted as a function of the relative time $t_{\text{rel}}$ the trigger and the 
+FADC clock in the range $[-0.5,0.5[ \ T_{\text{ADC}}$, the second weight in the range $[0.5,1.5[ \ T_{\text{ADC}}$ and so on. A binning resolution 
+of $0.1  T_{\text{ADC}}$ has been chosen.} \label{fig:w_time_MC_input_TDAS}
 \end{figure}
 
@@ -516,5 +540,8 @@
 \includegraphics[totalheight=7cm]{w_amp_MC_input_TDAS.eps}
 \end{center}
-\caption[Amplitude weights.]{Amplitude weights $w_{\mathrm{amp}}(t_0) \ldots w_{\mathrm{amp}}(t_5)$ for a window size of 6 FADC slices for the pulse shape used in the MC simulations. The first weight $w_{\mathrm{amp}}(t_0)$ is plotted as a function of the relative time $t_{\text{rel}}$ the trigger and the FADC clock in the range $[-0.5;0.5[ \ T_{\text{ADC}}$, the second weight in the range $[0.5;1.5[ \ T_{\text{ADC}}$ and so on. A binning resolution of $0.1  T_{\text{ADC}}$ has been chosen.} \label{fig:w_amp_MC_input_TDAS}
+\caption[Amplitude weights.]{Amplitude weights $w_{\mathrm{amp}}(t_0) \ldots w_{\mathrm{amp}}(t_5)$ for a window size of 6 FADC slices for the 
+pulse shape used in the MC simulations. The first weight $w_{\mathrm{amp}}(t_0)$ is plotted as a function of the relative time $t_{\text{rel}}$ 
+the trigger and the FADC clock in the range $[-0.5,0.5[ \ T_{\text{ADC}}$, the second weight in the range $[0.5,1.5[ \ T_{\text{ADC}}$ and so on. 
+A binning resolution of $0.1\, T_{\text{ADC}}$ has been chosen.} \label{fig:w_amp_MC_input_TDAS}
 \end{figure}
 
@@ -577,4 +604,8 @@
 
 
+\ldots
+\textit {\bf FIGURE~\ref{fig:shape_fit_TDAS} shows what???}
+\ldots
+
 Figure \ref{fig:shape_fit_TDAS} shows the FADC slices of a single MC event together with the result of a full 
 fit of the input MC pulse shape to the simulated FADC samples together with the result of the numerical fit 
@@ -602,5 +633,9 @@
 \item "cosmics\_weights4.dat'' with a window size of 4 FADC slices
 \item "calibration\_weights\_blue.dat'' with a window size of 6 FADC slices
+\item "calibration\_weights4\_blue.dat'' with a window size of 4 FADC slices
 \item "calibration\_weights\_UV.dat'' with a window size of 6 FADC slices and in the low-gain the 
+calibration weigths obtained from blue pulses\footnote{UV-pulses saturating the high-gain are not yet
+available.}.
+\item "calibration\_weights4\_UV.dat'' with a window size of 4 FADC slices and in the low-gain the 
 calibration weigths obtained from blue pulses\footnote{UV-pulses saturating the high-gain are not yet
 available.}.
@@ -608,4 +643,12 @@
 weights. This file is only used for stability tests.
 \item "cosmics\_weights4\_logaintest.dat'' with a window size of 4 FADC slices and swapped high-gain and low-gain
+weights. This file is only used for stability tests.
+\item "calibration\_weights\_UV\_logaintest.dat'' with a window size of 6 FADC slices and swapped high-gain and low-gain
+weights. This file is only used for stability tests.
+\item "calibration\_weights4\_UV\_logaintest.dat'' with a window size of 4 FADC slices and swapped high-gain and low-gain
+weights. This file is only used for stability tests.
+\item "calibration\_weights\_blue\_logaintest.dat'' with a window size of 6 FADC slices and swapped high-gain and low-gain
+weights. This file is only used for stability tests.
+\item "calibration\_weights4\_blue\_logaintest.dat'' with a window size of 4 FADC slices and swapped high-gain and low-gain
 weights. This file is only used for stability tests.
 \end{itemize}
@@ -710,9 +753,16 @@
 \item[MExtractTimeAndChargeDigitalFilter]: with the following initialization:
 \resume{enumerate}
-\item SetWeightsFile(``cosmic\_weights6.dat'');
-\item SetWeightsFile(``cosmic\_weights4.dat'');
+\item SetWeightsFile(``cosmics\_weights.dat'');
+\item SetWeightsFile(``cosmics\_weights4.dat'');
+\item SetWeightsFile(``calibration\_weights\_UV.dat'');
+\item SetWeightsFile(``calibration\_weights4\_UV.dat'');
+\item SetWeightsFile(``calibration\_weights\_blue.dat'');
+\item SetWeightsFile(``calibration\_weights4\_blue.dat'');
 \item SetWeightsFile(``cosmic\_weights\_logain6.dat'');
 \item SetWeightsFile(``cosmic\_weights\_logain4.dat'');
-\item SetWeightsFile(``calibration\_weights\_UV6.dat'');
+\item SetWeightsFile(``calibration\_weights\_UV\_logaintest.dat'');
+\item SetWeightsFile(``calibration\_weights4\_UV\_logaintest.dat'');
+\item SetWeightsFile(``calibration\_weights\_blue\_logaintest.dat'');
+\item SetWeightsFile(``calibration\_weights4\_blue\_logaintest.dat'');
 \suspend{enumerate}
 \item[``Real Fit'']: (not yet implemented, one try)
@@ -722,5 +772,5 @@
 \end{description}
 
-Note that the extractors \#30, \#31 are used only to test the stability of the extraction against 
+Note that the extractors \#34 through \#39 are used only to test the stability of the extraction against 
 changes in the pulse-shape.
 
Index: trunk/MagicSoft/TDAS-Extractor/Changelog
===================================================================
--- trunk/MagicSoft/TDAS-Extractor/Changelog	(revision 5992)
+++ trunk/MagicSoft/TDAS-Extractor/Changelog	(revision 5993)
@@ -19,4 +19,8 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+2004/01/26: Markus Gaug
+  * Algorithms.tex: text updated and new figures
+
 
 2004/01/18: Markus Gaug
Index: trunk/MagicSoft/TDAS-Extractor/Pedestal.tex
===================================================================
--- trunk/MagicSoft/TDAS-Extractor/Pedestal.tex	(revision 5992)
+++ trunk/MagicSoft/TDAS-Extractor/Pedestal.tex	(revision 5993)
@@ -359,10 +359,4 @@
 
 
-
-\vspace{1cm}
-\ldots{\it More test plots can be found under: 
-http://magic.ifae.es/$\sim$markus/ExtractorPedestals/ }
-\vspace{1cm}
-
 %%% Local Variables: 
 %%% mode: latex
