Changeset 5765

Timestamp:

01/10/05 11:58:32 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/macros/getExtractor.C (modified) (1 diff)
• TDAS-Extractor/Algorithms.tex (modified) (2 diffs)

trunk/MagicSoft/Mars/macros/getExtractor.C

@@ -201 +201 @@
       break;
     case 2:
-      extractor->SetRange(4,7,5,10);
+      extractor->SetRange(4,7,6,11);
       break;
     case 3:
-      extractor->SetRange(3,8,5,10);
+      extractor->SetRange(4,9,6,11);
       break;
     case 4:
-      extractor->SetRange(2,9,4,11);
+      extractor->SetRange(4,11,6,13);
       break;
     case 5:
-      extractor->SetRange(0,13,4,13);
+      extractor->SetRange(3,16,5,14);
       break;
       // MExtractFixedWindowSpline:
     case 6:
-      extractor->SetRange(3,7,5,9);
+      extractor->SetRange(4,8,6,10);
       break;
     case 7:
-      extractor->SetRange(3,7,5,11);
+      extractor->SetRange(4,8,5,11);
       break;
     case 8:
-      extractor->SetRange(3,9,5,11);
+      extractor->SetRange(4,10,5,11);
       break;
     case 9:
-      extractor->SetRange(2,10,4,12);
+      extractor->SetRange(3,11,5,13);
       break;
     case 10:
-      extractor->SetRange(0,14,4,14);
+      extractor->SetRange(3,17,4,14);
       break;
       // MExtractFixedWindowPeakSearch:

trunk/MagicSoft/TDAS-Extractor/Algorithms.tex

@@ -538 +538 @@
 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 
+It fits the pulse shape to a Landau convoluted with a Gaussian using the following 
 parameters:...
 
@@ -555 +555 @@
 \subsection{Used Extractors for this Analysis}
 
-We propose to test the following parameterized extractors:
-
-\begin{description}
-\item[MExtractFixedWindow]: with the following parameters, if {\textit{maxbin}} defines the 
-   mean position of the High-Gain FADC slice carrying the pulse maximum:
+We tested in this TDAS the following parameterized extractors:
+
+\begin{description}
+\item[MExtractFixedWindow]: with the following intialization, if {\textit{maxbin}} defines the 
+   mean position of the high-gain FADC slice which carries the pulse maximum \footnote{The function 
+{\textit{MExtractor::SetRange(higain first, higain last, logain first, logain last)}} sets the extraction 
+range with the high gain start bin {\textit{higain first}} to (including) the last bin {\textit{higain last}}. 
+Analoguously for the low gain extraction range. Note that in MARS, the low-gain FADC samples start with 
+the index 0 again, thus {\textit{maxbin+0.5}} means in reality {\textit{maxbin+15+0.5}}. }
+:
 \begin{enumerate}
 \item SetRange({\textit{maxbin}}-1,{\textit{maxbin}}+2,{\textit{maxbin}}+0.5,{\textit{maxbin}}+3.5);
 \item SetRange({\textit{maxbin}}-1,{\textit{maxbin}}+2,{\textit{maxbin}}-0.5,{\textit{maxbin}}+4.5);
 \item SetRange({\textit{maxbin}}-2,{\textit{maxbin}}+3,{\textit{maxbin}}-0.5,{\textit{maxbin}}+4.5);
-\item SetRange({\textit{maxbin}}-3,{\textit{maxbin}}+4,{\textit{maxbin}}-1.5,{\textit{maxbin}}+5.5);
-\item SetRange({\textit{maxbin}}-5,{\textit{maxbin}}+8,{\textit{maxbin}}-1.5,{\textit{maxbin}}+7.5);
+\item SetRange({\textit{maxbin}}-2,{\textit{maxbin}}+5,{\textit{maxbin}}-0.5,{\textit{maxbin}}+6.5);
+\item SetRange({\textit{maxbin}}-3,{\textit{maxbin}}+10,{\textit{maxbin}}-1.5,{\textit{maxbin}}+7.5);
 \suspend{enumerate}
-\item[MExtractFixedWindowSpline]: with the following parameters, if {\textit{maxbin}} defines the 
-   mean position of the High-Gain FADC slice carrying the pulse maximum:
+\item[MExtractFixedWindowSpline]: with the following initialization, if {\textit{maxbin}} defines the 
+   mean position of the high-gain FADC slice carrying the pulse maximum footnote{The function 
+{\textit{MExtractor::SetRange(higain first, higain last, logain first, logain last)}} sets the extraction 
+range with the high gain start bin {\textit{higain first}} to (including) the last bin {\textit{higain last}}. 
+Analoguously for the low gain extraction range. Note that in MARS, the low-gain FADC samples start with 
+the index 0 again, thus {\textit{maxbin+0.5}} means in reality {\textit{maxbin+15+0.5}}.:
 \resume{enumerate}
-\item SetRange({\textit{maxbin}}-1,{\textit{maxbin}}+2,{\textit{maxbin}}+0.5,{\textit{maxbin}}+3.5);
-\item SetRange({\textit{maxbin}}-1,{\textit{maxbin}}+2,{\textit{maxbin}}-0.5,{\textit{maxbin}}+4.5);
-\item SetRange({\textit{maxbin}}-2,{\textit{maxbin}}+3,{\textit{maxbin}}-0.5,{\textit{maxbin}}+4.5);
-\item SetRange({\textit{maxbin}}-3,{\textit{maxbin}}+4,{\textit{maxbin}}-1.5,{\textit{maxbin}}+5.5);
-\item SetRange({\textit{maxbin}}-5,{\textit{maxbin}}+8,{\textit{maxbin}}-1.5,{\textit{maxbin}}+7.5);
+\item SetRange({\textit{maxbin}}-1,{\textit{maxbin}}+3,{\textit{maxbin}}+0.5,{\textit{maxbin}}+4.5);
+\item SetRange({\textit{maxbin}}-1,{\textit{maxbin}}+3,{\textit{maxbin}}-0.5,{\textit{maxbin}}+5.5);
+\item SetRange({\textit{maxbin}}-2,{\textit{maxbin}}+4,{\textit{maxbin}}-0.5,{\textit{maxbin}}+5.5);
+\item SetRange({\textit{maxbin}}-2,{\textit{maxbin}}+6,{\textit{maxbin}}-0.5,{\textit{maxbin}}+7.5);
+\item SetRange({\textit{maxbin}}-3,{\textit{maxbin}}+11,{\textit{maxbin}}-1.5,{\textit{maxbin}}+8.5);
 \suspend{enumerate}
 \item[MExtractFixedWindowPeakSearch]: with the following parameters: \\