Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5594)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5595)
@@ -25,4 +25,8 @@
   * msignal/MExtractor.[h,cc]
     - add possibility to set pedestal pointer from outside
+
+  * msignal/MExtractTimeAndCharge.[h,cc]
+    - make modification of extraction window only for case of now 
+      high-gain saturation.
 
   * msignal/MExtractTimeAndChargeSpline.cc
Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 5594)
+++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 5595)
@@ -191,7 +191,8 @@
       if (pixel.HasLoGain())
         {
-          fLoGainFirstSave = (Int_t)fLoGainFirst;
-          const Int_t logainstart = (Int_t)(timehi+fLoGainStartShift);
-          fLoGainFirst     = logainstart > fLoGainFirstSave ? logainstart : fLoGainFirstSave;
+          fLoGainFirstSave = fLoGainFirst;
+          const Byte_t logainstart = (Byte_t)(timehi+fLoGainStartShift);
+          if (!sathi)
+            fLoGainFirst = logainstart > fLoGainFirstSave ? logainstart : fLoGainFirstSave;
         
           if ( fLoGainFirst < fLoGainLast )
@@ -203,5 +204,4 @@
                                       satlo, ped, logainabflag);
             }
-          
           fLoGainFirst     = fLoGainFirstSave;
         }
Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h	(revision 5594)
+++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h	(revision 5595)
@@ -13,5 +13,5 @@
   static const Float_t fgLoGainStartShift; // Default for fLoGainStartShift (now set to: -2.8)
   
-  Int_t   fLoGainFirstSave;       //! Temporary variable to store the original position of low-gain start slice
+  Byte_t  fLoGainFirstSave;       //! Temporary variable to store the original position of low-gain start slice
   Float_t fLoGainStartShift;      // Shift to start searching the low-gain signal obtained from the high-gain times.