Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3102)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3103)
@@ -7,7 +7,10 @@
  2004/02/11: Hendrik Bartko
    * manalysis/MExtractSignal2 (Signal Extraction with a Sliding Window)
-     - introduced a validity check for the set-function of the window size (even number of slices, WindowSize < NumberSlices)
-   * manalysis/MArrivalTimeCalc2 (Arrival Time Calculation with a Sliding Window)
-     - introduced the calculation of the arrival time as the signal weighted mean of the time slices in the maximum window
+     - introduced a validity check for the set-function of the window 
+       size (even number of slices, WindowSize < NumberSlices)
+   * manalysis/MArrivalTimeCalc2 (Arrival Time Calculation with a 
+     Sliding Window)
+     - introduced the calculation of the arrival time as the signal 
+       weighted mean of the time slices in the maximum window
 
 
Index: /trunk/MagicSoft/Mars/manalysis/MExtractSignal2.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MExtractSignal2.h	(revision 3102)
+++ /trunk/MagicSoft/Mars/manalysis/MExtractSignal2.h	(revision 3103)
@@ -19,5 +19,5 @@
     static const Byte_t fgFirst;
     static const Byte_t fgLast;
-    static const Byte_t fgWindow;
+    static const Byte_t fgWindowSize;
 
     MPedestalCam        *fPedestals;    // Pedestals of all pixels in the camera
@@ -27,4 +27,8 @@
     MRawRunHeader       *fRunHeader;    // RunHeader information
 
+    /*
+     MArrivalTime        *fArrivalTime;  // Arrival Time of FADC sample
+     */
+  
     Byte_t  fHiGainFirst;       // First hi gain to be used
     Byte_t  fLoGainFirst;       // First lo gain to be used
@@ -33,6 +37,6 @@
     Byte_t  fNumLoGainSamples;  // Number of lo gain to be used
 
-    Byte_t  fWindow;            // Number of gains in window
-    Float_t fWindowSqrt;        // Sqaure root of number of gains in window
+    Byte_t  fWindowSize;            // Number of gains in window
+    Float_t fWindowSizeSqrt;        // Sqaure root of number of gains in window
 
     Byte_t  fSaturationLimit;
@@ -46,5 +50,5 @@
     MExtractSignal2(const char *name=NULL, const char *title=NULL);
 
-    void SetRange(Byte_t hifirst=fgFirst, Byte_t hilast=fgLast, Byte_t window=fgWindow);
+    void SetRange(Byte_t hifirst=fgFirst, Byte_t hilast=fgLast, Byte_t lofirst=fgFirst, Byte_t lolast=fgLast, Byte_t window_size=fgWindowSize);
     void SetSaturationLimit(Byte_t lim) { fSaturationLimit = lim; }