Index: /trunk/MagicSoft/TDAS-Extractor/Algorithms.tex =================================================================== --- /trunk/MagicSoft/TDAS-Extractor/Algorithms.tex (revision 6537) +++ /trunk/MagicSoft/TDAS-Extractor/Algorithms.tex (revision 6538) @@ -883,10 +883,4 @@ \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\_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[MExtractTimeAndChargeDigitalFilterPeakSearch]: with the following initialization: @@ -902,7 +896,4 @@ \end{description} -Note that the extractors \#34 through \#39 are used only to test the stability of the extraction against -changes in the pulse-shape. - References: \cite{OF77,OF94}. Index: /trunk/MagicSoft/TDAS-Extractor/Calibration.tex =================================================================== --- /trunk/MagicSoft/TDAS-Extractor/Calibration.tex (revision 6537) +++ /trunk/MagicSoft/TDAS-Extractor/Calibration.tex (revision 6538) @@ -459,8 +459,8 @@ Figure~\ref{fig:linear:phevscharge23} shows the conversion factors using the amplitude-extracting spline (extractor \#23). -Here, the linearity is worse than in the previous samples. A very clear difference between high-gain and +Here, the linearity worse than in the previous sample. A very clear difference between high-gain and low-gain regions can be seen as well as a bigger general spread in conversion factors. In order to investigate if there is a common, systematic effect of the extractor, we show the averaged conversion factors over all -inner and outer pixels in figure~\ref{fig:linear:phevschargearea23}. Both characteristics are maintained, +inner and outer pixels in figure~\ref{fig:linear:phevschargearea23}. Both characteristics are maintained there. Although the differences between high-gain and low-gain can be easily corrected for, we conclude that extractor \#23 is still unstable against the linearity tests. @@ -488,5 +488,5 @@ in conversion factors is smaller. Figure~\ref{fig:linear:phevschargearea24} shows already rather good stability except for the two -lowest intensity pulses in green and blue. We conclude that extractor \#24 is still not too stable, but +lowest intensity pulses in green and blue. We conclude that extractor \#24 is still un-stable, but preferable to amplitude extractor. \par @@ -509,11 +509,10 @@ \end{figure} -Looking at figure~\ref{fig:linear:phevscharge25}, one can see that raising the integration window by +Looking at figure~\ref{fig:linear:phevscharge25}, one can see that raising the integration window to two effective FADC slices in the high-gain and three effective FADC slices in the low-gain -(extractor \#25), the stability is completely resumed, except for that -there seems to be a small systematic increase of the conversion factor in the low-gain range. This effect -is not significant in figure~\ref{fig:linear:phevschargearea25}, however it can be seen in five out of the -six tested channels of figure~\ref{fig:linear:phevscharge25}. We conclude that extractor \#25 is -almost as stable as the fixed window extractors. +(extractor \#25), the stability is completely resumed, except for +a small systematic increase of the conversion factor in the low-gain range. This effect +is not very significant, however it can be seen in five out of the +six tested channels. We conclude that extractor \#25 is almost as stable as the fixed window extractors. \par @@ -535,9 +534,9 @@ \end{figure} -Figure~\ref{fig:linear:phevscharge30} shows the conversion factors using a digital filter, -applied on 6 FADC slices with weights calculated from the UV-calibration pulse. -One can see that many blue and green calibration pulses at low and intermediate intensity fall -out of the linear region, moreover there is also a systematic offset between high-gain and low-gain region. -It seems that the digital filter does not pass this test if the pulse form changes slightly from the +Figure~\ref{fig:linear:phevscharge30} and~\ref{fig:linear:phevscharge31} show the conversion factors using a digital filter, +applied on 6 FADC slices and respectively 4 FADC slices with weights calculated from the UV-calibration pulse. +One can see that one or two blue calibration pulses at low and intermediate intensity fall +out of the linear region, moreover there is a small systematic offset between the high-gain and low-gain region. +It seems that the digital filter does not pass this test if the pulse form changes for more than 2\,ns from the expected one. The effect is not as problematic as it may appear here, because the actual calibration will not calculate the number of photo-electrons (with the F-Factor method) for every signal intensity. Index: /trunk/MagicSoft/TDAS-Extractor/Results.tex =================================================================== --- /trunk/MagicSoft/TDAS-Extractor/Results.tex (revision 6537) +++ /trunk/MagicSoft/TDAS-Extractor/Results.tex (revision 6538) @@ -46,12 +46,11 @@ \hline 23 & Spline Amplitude & \ok & \no & \no & \ok & \ok & \ok & \no & \no & \ok \\ -24 & Splne Int. (1,1.5) & \ok & \ok & \ok & \ok & \ok & \best & \ok & \ok & \no \\ +24 & Splne Int. (1,1.5) & \ok & \ok & \ok & \ok & \ok & \best & \ok & \no & \no \\ 25 & Spline Int. (2,3) & \ok &\ok & \best&\ok & \ok & \best & \ok & \ok & \no \\ 26 & Spline Int. (4,6) & \ok &\ok & \ok & \ok & \ok & \best & \ok & \ok & \no \\ 27 & Spline Int. (6,9) & \no &\best& \ok & \ok & \ok & \best & \ok & \ok & \no \\ \hline -28 & Dig. Filt. (6,6) & \ok &\ok & & \ok & \ok & \ok & \ok & \ok & \ok \\ -29 & Dig. Filt. (4,4) & \best &\ok & & \ok & \ok & \best& \ok & \ok & \ok \\ -30 & Dig. Filt. Pk S. (4,6) & & & & & & & & & \ok \\ +28 & Dig. Filt. (6,6) & \ok &\ok & \ok & \ok & \ok & \ok & \ok & \ok & \ok \\ +29 & Dig. Filt. (4,4) & \best &\ok & \ok & \ok & \ok & \best& \ok & \ok & \ok \\ \hline \hline