Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 2765)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 2766)
@@ -4,4 +4,11 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/01/12: Markus Gaug
+  * manalysis/MExtractSignal.[h,cc]
+    - take out some uncommented code 
+    - replace logainshift by two independent variables: 
+      logainfirst, logainlast
+
+
  2004/01/09: Markus Gaug
 
Index: /trunk/MagicSoft/Mars/manalysis/MExtractSignal.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MExtractSignal.h	(revision 2765)
+++ /trunk/MagicSoft/Mars/manalysis/MExtractSignal.h	(revision 2766)
@@ -31,5 +31,5 @@
   MRawRunHeader            *fRunHeader;    // RunHeader information
 
-  Byte_t fFirst;
+  Byte_t fHiGainFirst;
   Byte_t fLoGainFirst;
 
@@ -47,9 +47,8 @@
   
 public:
-  MExtractSignal(/*const Byte_t first=4, const Byte_t last=9,
-                 const Byte_t logainshift=1,*/
-                 const char *name=NULL, const char *title=NULL);
 
-  void SetRange(Byte_t first=4, Byte_t last=9, Byte_t logainshift=1);
+  MExtractSignal(const char *name=NULL, const char *title=NULL);
+
+  void SetRange(Byte_t hifirst=3, Byte_t hilast=8, Byte_t lofirst=3, Byte_t lolast=8);
   void SetSaturationLimit(Byte_t lim)      { fSaturationLimit = lim; }
 
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc	(revision 2765)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc	(revision 2766)
@@ -478,10 +478,4 @@
 
       //
-      // Fill 1-dim histograms with the results
-      //
-      fCalibrations->Fill1DimCharges(pix.GetCharge(),pix.GetErrCharge(),
-                                     pix.GetSigmaCharge(),pix.GetChargeProb());
-
-      //
       // Perform the Gauss fits to the arrival times
       //