Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8660)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8661)
@@ -19,4 +19,12 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2007/08/10 Thomas Bretz
+
+   * msignal/MExtractTimeAndCharge.cc:
+     - fSaturationLimit must be multiplied with GetScale() not with
+       GetMax()... grmpf.
+
+
+
  2007/08/06 Thomas Bretz
 
@@ -64,4 +72,15 @@
        with a fixed value. This doesn't influence enaything. And the
        absolute avlue of the error is not used at all.
+
+
+
+ 2007/08/03 Thomas Bretz
+
+   * macros/optim/optimdisp.C:
+     - adapted to new parametrization
+
+   * mjtrain/MJTrainDisp.[h,cc]:
+     - some small fixes and changes.
+     - added code (as comment) for training a ghostbuster
 
 
Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 8660)
+++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 8661)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndCharge.cc,v 1.67 2007-06-30 11:16:17 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndCharge.cc,v 1.68 2007-08-10 11:21:21 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -222,5 +222,5 @@
     const Int_t numl = fRunHeader->GetNumSamplesLoGain();
 
-    const UInt_t satlim = fSaturationLimit*fRunHeader->GetMax();
+    const UInt_t satlim = fSaturationLimit*fRunHeader->GetScale();
 
     MRawEvtPixelIter pixel(fRawEvt);