Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3711)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3712)
@@ -21,7 +21,12 @@
 
    * mcalib/MCalibrationPix.[h,cc]
-     add functions GetHiLoMeansDivided(), GetHiLoSigmasDivided() and 
-     errors
-
+     - add functions GetHiLoMeansDivided(), GetHiLoSigmasDivided() and 
+       errors
+
+   * mcalib/MCalibrationChargeCam.[h,cc]
+     - removed hi-vs.Lo histograms (come into a separate MIntensityCam) 
+     - updated GetPixelContents
+     - updated class documentation
+  
 
  2004/04/13: Thomas Bretz
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.h	(revision 3711)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.h	(revision 3712)
@@ -6,29 +6,19 @@
 #endif
 
-class TH1D;
-class TH2D;
-
 class MCalibrationChargeCam : public MCalibrationCam
 {
 private:
   
-  TH1D* fOffsets;                    //! Histogram with Higain-vs-LoGain fit result Offsets
-  TH1D* fSlopes;                     //! Histogram with Higain-vs-LoGain fit result Slopes
-  TH2D* fOffvsSlope;                 //! Histogram with Higain-vs-LoGain fit result Offsets vs. Slopes
-
   Byte_t  fFlags;                    // Bit-field to hold the flags
 
   enum  { kFFactorMethodValid };
 
-  
 public:
 
   MCalibrationChargeCam(const char *name=NULL, const char *title=NULL);
-  ~MCalibrationChargeCam();
   
   void   Clear ( Option_t *o="" );
   
   // Draws
-//  void DrawHiLoFits();
   void   DrawPixelContent(Int_t num)   const;    
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc	(revision 3711)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc	(revision 3712)
@@ -349,4 +349,6 @@
 }
 
+
+
 // --------------------------------------------------------------------------
 //
@@ -659,5 +661,5 @@
 //
 // Calculate the total F-Factor with the formula:
-//   fMeanFFactorFADC2Phot = Sqrt ( fRSigmaSquare ) / GetMean()  * sqrt( nphotons )
+//   fMeanFFactorFADC2Phot = Sqrt ( fRSigmaSquare ) / GetMean()  * sqrt(nphotons)
 //
 // Calculate the error of the total F-Factor
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc	(revision 3711)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc	(revision 3712)
@@ -132,4 +132,5 @@
 // --------------------------------------------------------------------------
 //
+// Return -1, if IsHiGainSaturation()
 // Return -1, if the LoGain Mean is zero or -1. (has not yet been set)
 // Return -1, if the HiGain Mean is -1.         (has not yet been set) 
@@ -139,4 +140,7 @@
 {
   
+  if (IsHiGainSaturation())
+    return -1.;
+
   if (fLoGainMean == 0. || fLoGainMean == -1.)
     return -1.;
@@ -151,4 +155,5 @@
 // ----------------------------------------------------------------------------------
 //
+// Return -1, if IsHiGainSaturation()
 // Return -1, if the LoGain Mean or its variance is zero or -1. (has not yet been set)
 // Return -1, if the HiGain Mean or its variance is -1.         (has not yet been set) 
@@ -158,4 +163,7 @@
 {
   
+  if (IsHiGainSaturation())
+    return -1.;
+
   if (fLoGainMean == 0. || fLoGainMean == -1.)
     return -1.;
@@ -180,4 +188,5 @@
 // --------------------------------------------------------------------------
 //
+// Return -1, if IsHiGainSaturation()
 // Return -1, if the LoGain Sigma is zero or -1. (has not yet been set)
 // Return -1, if the HiGain Sigma is -1.         (has not yet been set) 
@@ -187,4 +196,7 @@
 {
   
+  if (IsHiGainSaturation())
+    return -1.;
+
   if (fLoGainSigma == 0. || fLoGainSigma == -1.)
     return -1.;
@@ -199,4 +211,5 @@
 // ----------------------------------------------------------------------------------
 //
+// Return -1, if IsHiGainSaturation()
 // Return -1, if the LoGain Sigma or its variance is zero or -1. (has not yet been set)
 // Return -1, if the HiGain Sigma or its variance is -1.         (has not yet been set) 
@@ -206,4 +219,7 @@
 {
   
+  if (IsHiGainSaturation())
+    return -1.;
+
   if (fLoGainSigma == 0. || fLoGainSigma == -1.)
     return -1.;