Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3762)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3763)
@@ -18,4 +18,19 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/04/16: Markus Gaug
+
+   * msignal/MExtractSignal.cc
+     - commited proposed larger default window from fgLast = 10 to 
+       fgLast = 14, because in March the pulses have moved to later 
+       arrival times.
+
+   * msignal/MExtractSignal2.cc
+     - committed the proposed smaller window egdes from fgFirst=0 to 
+       fgFirst = 3, because in March some of the high-gain pulses reach 
+       into the "low-gain samples" and mislead thus sliding window to 
+       be maximized on the tail of the high-gain pulse.
+
+
+
  2004/04/15: Markus Gaug
 
Index: trunk/MagicSoft/Mars/manalysis/MPedPhotCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MPedPhotCalc.cc	(revision 3762)
+++ trunk/MagicSoft/Mars/manalysis/MPedPhotCalc.cc	(revision 3763)
@@ -159,15 +159,8 @@
        const MCerPhotPix &pix = (*fCerPhot)[i];
 
-        if (fBadPixels)
-          {
-            const MBadPixelsPix &bad = (*fBadPixels)[i];
-            if (bad.IsBad())
-              continue;
-          }
-
-        const Float_t nphot = pix.GetNumPhotons();
-
-        fSumx[i]  += nphot;
-        fSumx2[i] += nphot*nphot;
+       const Float_t nphot = pix.GetNumPhotons();
+       
+       fSumx[i]  += nphot;
+       fSumx2[i] += nphot*nphot;
     }
 
Index: trunk/MagicSoft/Mars/msignal/MExtractSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractSignal.cc	(revision 3762)
+++ trunk/MagicSoft/Mars/msignal/MExtractSignal.cc	(revision 3763)
@@ -53,6 +53,5 @@
 const Byte_t MExtractSignal::fgSaturationLimit = 254;
 const Byte_t MExtractSignal::fgFirst =  3;
-const Byte_t MExtractSignal::fgLast  = 10;
-
+const Byte_t MExtractSignal::fgLast  = 14;
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/msignal/MExtractSignal2.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractSignal2.cc	(revision 3762)
+++ trunk/MagicSoft/Mars/msignal/MExtractSignal2.cc	(revision 3763)
@@ -57,8 +57,7 @@
 
 const Byte_t MExtractSignal2::fgSaturationLimit = 254;
-const Byte_t MExtractSignal2::fgFirst  =  0;
-const Byte_t MExtractSignal2::fgLast   = 14;
+const Byte_t MExtractSignal2::fgFirst      =  3;
+const Byte_t MExtractSignal2::fgLast       = 14;
 const Byte_t MExtractSignal2::fgWindowSize = 6;
-
 // --------------------------------------------------------------------------
 //