Index: trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.cc	(revision 3867)
+++ trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.cc	(revision 3868)
@@ -65,5 +65,5 @@
 
 
-void MExtractFixedWindow::FindSignalHiGain(Byte_t *ptr, Int_t size, Int_t &sum, Byte_t &sat) const
+void MExtractFixedWindow::FindSignalHiGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const
 {
 
@@ -82,5 +82,5 @@
 }
 
-void MExtractFixedWindow::FindSignalLoGain(Byte_t *ptr, Int_t size, Int_t &sum, Byte_t &sat) const
+void MExtractFixedWindow::FindSignalLoGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const
 {
 
Index: trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.h
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.h	(revision 3867)
+++ trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.h	(revision 3868)
@@ -22,6 +22,6 @@
   static const Byte_t fgLoGainLast;      // Last FADC slice Lo-Gain (currently set to: 14) 
 
-  void   FindSignalHiGain(Byte_t *ptr, Int_t last, Int_t &sum, Byte_t &sat) const;
-  void   FindSignalLoGain(Byte_t *ptr, Int_t last, Int_t &sum, Byte_t &sat) const;
+  void   FindSignalHiGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const;
+  void   FindSignalLoGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const;
 
   void   StreamPrimitive(ofstream &out) const;
Index: trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.cc	(revision 3867)
+++ trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.cc	(revision 3868)
@@ -192,5 +192,5 @@
 // is stored in "sum", and the number of saturated  slices in "sat".
 //
-void MExtractFixedWindowPeakSearch::FindSignalHiGain(Byte_t *ptr, Int_t size, Int_t &sum, Byte_t &sat) const
+void MExtractFixedWindowPeakSearch::FindSignalHiGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const
 {
   //
@@ -217,5 +217,5 @@
 // is stored in "sum", and the number of saturated  slices in "sat".
 //
-void MExtractFixedWindowPeakSearch::FindSignalLoGain(Byte_t *ptr, Int_t size, Int_t &sum, Byte_t &sat) const
+void MExtractFixedWindowPeakSearch::FindSignalLoGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const
 {
   //
@@ -296,5 +296,5 @@
       Byte_t sathi;
 
-      FindSignalHiGain(pixel.GetHiGainSamples()+hiGainFirst, fWindowSizeHiGain, sumhi, sathi);
+      FindSignalHiGain(pixel.GetHiGainSamples()+hiGainFirst, sumhi, sathi);
 
       Int_t sumlo=0;
@@ -302,5 +302,5 @@
       if (pixel.HasLoGain())
         {
-	  FindSignalLoGain(pixel.GetLoGainSamples()+loGainFirst, fWindowSizeLoGain, sumlo, satlo);
+	  FindSignalLoGain(pixel.GetLoGainSamples()+loGainFirst, sumlo, satlo);
 	  if (satlo)
 	    sat++;
Index: trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.h
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.h	(revision 3867)
+++ trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.h	(revision 3868)
@@ -23,6 +23,6 @@
   Byte_t  fWindowSizeLoGain;     // Number of Lo Gain slices in window
 
-  void   FindSignalHiGain(Byte_t *ptr, Int_t last, Int_t &sum, Byte_t &sat) const;
-  void   FindSignalLoGain(Byte_t *ptr, Int_t last, Int_t &sum, Byte_t &sat) const;  
+  void   FindSignalHiGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const;
+  void   FindSignalLoGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const;  
 
   void   FindPeak(Byte_t *ptr, Byte_t window, Byte_t &startslice, Int_t &signal, Int_t &sat) const;
Index: trunk/MagicSoft/Mars/msignal/MExtractSlidingWindow.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractSlidingWindow.cc	(revision 3867)
+++ trunk/MagicSoft/Mars/msignal/MExtractSlidingWindow.cc	(revision 3868)
@@ -100,7 +100,7 @@
 
 
-void MExtractSlidingWindow::FindSignalHiGain(Byte_t *ptr, Int_t size,  Int_t &max, Byte_t &sat) const
+void MExtractSlidingWindow::FindSignalHiGain(Byte_t *ptr, Int_t &max, Byte_t &sat) const
 {
-    const Byte_t *end = ptr + size;
+    const Byte_t *end = ptr + fHiGainLast - fHiGainFirst + 1;
 
     Int_t sum=0;
@@ -140,7 +140,7 @@
 
 
-void MExtractSlidingWindow::FindSignalLoGain(Byte_t *ptr, Int_t size,  Int_t &max, Byte_t &sat) const
+void MExtractSlidingWindow::FindSignalLoGain(Byte_t *ptr, Int_t &max, Byte_t &sat) const
 {
-    const Byte_t *end = ptr + size;
+    const Byte_t *end = ptr + fLoGainLast - fLoGainFirst + 1;
 
     Int_t sum=0;
Index: trunk/MagicSoft/Mars/msignal/MExtractSlidingWindow.h
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractSlidingWindow.h	(revision 3867)
+++ trunk/MagicSoft/Mars/msignal/MExtractSlidingWindow.h	(revision 3868)
@@ -20,6 +20,6 @@
   Byte_t  fWindowSizeLoGain;             // Number of Lo Gain slices in window  
   
-  void   FindSignalHiGain(Byte_t *ptr, Int_t last, Int_t &max, Byte_t &sat) const;
-  void   FindSignalLoGain(Byte_t *ptr, Int_t last, Int_t &max, Byte_t &sat) const;  
+  void   FindSignalHiGain(Byte_t *ptr, Int_t &max, Byte_t &sat) const;
+  void   FindSignalLoGain(Byte_t *ptr, Int_t &max, Byte_t &sat) const;  
 
 public:
Index: trunk/MagicSoft/Mars/msignal/MExtractor.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractor.cc	(revision 3867)
+++ trunk/MagicSoft/Mars/msignal/MExtractor.cc	(revision 3868)
@@ -135,10 +135,10 @@
 }
 
-void MExtractor::FindSignalHiGain(Byte_t *ptr, Int_t last, Int_t &sum, Byte_t &sat) const
+void MExtractor::FindSignalHiGain(Byte_t *firstused, Int_t &sum, Byte_t &sat) const
 {
   return;
 }
 
-void MExtractor::FindSignalLoGain(Byte_t *ptr, Int_t last, Int_t &sum, Byte_t &sat) const
+void MExtractor::FindSignalLoGain(Byte_t *firstused, Int_t &sum, Byte_t &sat) const
 {
   return;
@@ -163,5 +163,5 @@
       Byte_t sathi;
 
-      FindSignalHiGain(pixel.GetHiGainSamples()+fHiGainFirst, fHiGainLast, sumhi, sathi);
+      FindSignalHiGain(pixel.GetHiGainSamples()+fHiGainFirst, sumhi, sathi);
 
       Int_t  sumlo = 0;
@@ -170,5 +170,5 @@
       if (pixel.HasLoGain())
         {
-          FindSignalLoGain(pixel.GetLoGainSamples()+fLoGainFirst, fLoGainLast, sumlo, satlo);
+          FindSignalLoGain(pixel.GetLoGainSamples()+fLoGainFirst, sumlo, satlo);
           
           if (satlo)
Index: trunk/MagicSoft/Mars/msignal/MExtractor.h
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractor.h	(revision 3867)
+++ trunk/MagicSoft/Mars/msignal/MExtractor.h	(revision 3868)
@@ -45,6 +45,6 @@
     Byte_t  fSaturationLimit;
 
-    virtual void FindSignalHiGain(Byte_t *ptr, Int_t last, Int_t &sum, Byte_t &sat) const;
-    virtual void FindSignalLoGain(Byte_t *ptr, Int_t last, Int_t &sum, Byte_t &sat) const;
+    virtual void FindSignalHiGain(Byte_t *firstused, Int_t &sum, Byte_t &sat) const;
+    virtual void FindSignalLoGain(Byte_t *firstused, Int_t &sum, Byte_t &sat) const;
 
     virtual Int_t  PreProcess(MParList *pList);