Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8206)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8207)
@@ -45,4 +45,19 @@
      - small changes to output
      - changes to comments
+
+   * datacenter/macros/plotstat.C:
+     - changed division of pad, we have already too much periods
+
+   * mfilter/MFCosmics.cc:
+     - do not take invalid pixels into account
+
+   * mmain/MEventDisplay.cc:
+     - removed obsolete include of MExtractSignal
+
+   * msignal/MExtractTimeAndCharge.cc:
+     - in a possible case that the hi-gain etraction failed but the
+       lo-gain should be extracted we start one slice in front
+       of the lowest possible hi-gain time.
+
 
 
Index: trunk/MagicSoft/Mars/datacenter/macros/plotstat.C
===================================================================
--- trunk/MagicSoft/Mars/datacenter/macros/plotstat.C	(revision 8206)
+++ trunk/MagicSoft/Mars/datacenter/macros/plotstat.C	(revision 8207)
@@ -1,3 +1,5 @@
 /* ======================================================================== *\
+! $Name: not supported by cvs2svn $:$Id: plotstat.C,v 1.4 2006-11-02 17:44:08 tbretz Exp $
+! --------------------------------------------------------------------------
 !
 ! *
@@ -443,5 +445,5 @@
     cx.SetFrameBorderMode(0);
     cx.SetFillColor(kWhite);
-    cx.Divide(8,4);
+    cx.Divide(9,5);
     cx.cd(1);
     DrawLegend(h);
Index: trunk/MagicSoft/Mars/mmain/MEventDisplay.cc
===================================================================
--- trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 8206)
+++ trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 8207)
@@ -1,3 +1,5 @@
 /* ======================================================================== *\
+! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.56 2006-11-02 17:44:09 tbretz Exp $
+! --------------------------------------------------------------------------
 !
 ! *
@@ -18,5 +20,5 @@
 !   Author(s): Thomas Bretz, 10/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2006
 !
 !
@@ -82,5 +84,4 @@
 #include "MBadPixelsTreat.h"           // MBadPixelsTreat
 #include "MFillH.h"                    // MFillH
-#include "MExtractSignal.h"            // MExtractsignal
 #include "MMcCalibrationUpdate.h"      // MMcCalibrationUpdate
 #include "MCalibrateData.h"            // MCalibrateData
Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 8206)
+++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 8207)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndCharge.cc,v 1.58 2006-11-01 15:48:31 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndCharge.cc,v 1.59 2006-11-02 17:44:09 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -294,7 +294,6 @@
             //
             // The jitter in the hi-/lo-gain offset ssems to be around +/-0.5
-            if (deltatimehi>-0.5)
-                first = TMath::FloorNint(timehi+numh+fOffsetLoGain+fLoGainStartShift);
-            //else ???
+            const Float_t tm = deltatimehi<0 ? -1.+fHiGainFirst : timehi;
+            first = TMath::FloorNint(tm+numh+fOffsetLoGain+fLoGainStartShift);
 
             if (first<0)