Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3257)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3258)
@@ -6,5 +6,19 @@
  
 
+ 2004/02/21: Markus Gaug
+
+   * manalysis/MExtractedSignalPix.[h,cc]
+     
+     - changed variable fIsLoGainUsed to fLoGainUsed
+
  2004/02/20: Markus Gaug
+
+   * mcalib/MHCalibrationChargeHiGainPix.[h,cc]
+   * mcalib/MHCalibrationChargeLoGainPix.[h,cc]
+   * mcalib/Makefile
+   * mcalib/CalibLinkDef.h
+
+   - new class to replace MHCalibrationPixel, 
+     based on MHCalibrationChargePix
 
    * mcalib/MCalibrationChargeCalc.[h,cc]
Index: trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.cc	(revision 3257)
+++ trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.cc	(revision 3258)
@@ -19,5 +19,5 @@
 !   Author(s): Thomas Bretz 12/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !
@@ -57,5 +57,5 @@
     fExtractedSignalLoGain(gkSignalInitializer),
     fExtractedSignalLoGainError(gkSignalInitializer),
-    fIsLoGainUsed(kFALSE),
+    fLoGainUsed(kFALSE),
     fNumHiGainSaturated(0),
     fNumLoGainSaturated(0)
@@ -76,5 +76,5 @@
   fExtractedSignalLoGainError = gkSignalInitializer;
   
-  fIsLoGainUsed = kFALSE;
+  fLoGainUsed = kFALSE;
 
   fNumHiGainSaturated = 0;
@@ -105,5 +105,5 @@
 {
 
-  fIsLoGainUsed = sat; 
+  fLoGainUsed = sat; 
   fNumHiGainSaturated = higain; 
   fNumLoGainSaturated = logain;
@@ -114,5 +114,5 @@
     *fLog << " Signal: " << fExtractedSignalHiGain
         << " +- " << fExtractedSignalHiGainError
-        << " LoGain? " << fIsLoGainUsed
+        << " LoGain? " << fLoGainUsed
         << " Nr. Sat. Hi Gain: " <<  fNumHiGainSaturated
         << " Nr. Sat. Lo Gain: " <<  fNumLoGainSaturated
Index: trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h	(revision 3257)
+++ trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h	(revision 3258)
@@ -14,5 +14,5 @@
   Float_t fExtractedSignalLoGainError; // error of the mean value of the extracted signal
 
-  Bool_t fIsLoGainUsed;
+  Bool_t fLoGainUsed;
   Byte_t fNumHiGainSaturated;
   Byte_t fNumLoGainSaturated;
@@ -38,5 +38,5 @@
     Byte_t GetNumLoGainSaturated()          const { return fNumLoGainSaturated; }
 
-    Bool_t IsLoGainUsed() const { return fIsLoGainUsed; }
+    Bool_t IsLoGainUsed() const { return fLoGainUsed; }
     Bool_t IsValid() const;   
 
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.h	(revision 3257)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.h	(revision 3258)
@@ -36,4 +36,6 @@
   Axis_t   fAbsTimeLast;
 
+  Bool_t   fSaturated;
+
   enum { kMeanTimeInFirstBin, kMeanTimeInLastBin }; // Bits to hold information about arrival time results
   
@@ -58,4 +60,6 @@
   void SetPulserFrequency(Float_t f=fgPulserFrequency);
 
+  void    SetSaturated( const Bool_t b) { fSaturated = b; }
+
   // Getters
   TH1F *GetHAbsTime()                       { return &fHAbsTime;  }
@@ -66,4 +70,6 @@
   const Float_t  GetAbsTimeMean()     const;
   const Float_t  GetAbsTimeRms()      const;
+
+  const Bool_t   IsSaturated()        const { return fSaturated;   }
 
   void ChangeHistId(Int_t i);