Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 2838)
+++ trunk/MagicSoft/Mars/Changelog	(revision 2839)
@@ -4,4 +4,11 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/01/19: Markus Gaug
+
+   * mcalib/MCalibrationPix.[h,cc]
+     - new Flag fExcluded to indicate if pixel has been excluded from 
+       further analysis
+
 
  2004/01/16: Javier Rico & Pepe Flix
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationPINDiode.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationPINDiode.cc	(revision 2838)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationPINDiode.cc	(revision 2839)
@@ -34,4 +34,5 @@
 
 #include "MLog.h"
+#include "MLogManip.h"
 
 ClassImp(MCalibrationPINDiode);
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc	(revision 2838)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc	(revision 2839)
@@ -84,4 +84,5 @@
       fConversionSigmaPINDiodeMethod(-1.),
       fHiGainSaturation(kFALSE),
+      fExcluded(kFALSE),
       fFitValid(kFALSE),        
       fFitted(kFALSE), 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationPix.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationPix.h	(revision 2838)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationPix.h	(revision 2839)
@@ -54,4 +54,5 @@
   Bool_t  fHiGainSaturation;                // Is Lo-Gain used at all?
 
+  Bool_t  fExcluded;
   Bool_t  fFitValid;        
   Bool_t  fFitted; 
@@ -64,4 +65,5 @@
   Bool_t CheckChargeFitValidity();
   Bool_t CheckTimeFitValidity();
+  Bool_t CheckOscillations();  
   
 public:
@@ -73,9 +75,10 @@
 
   // Getter
+  Bool_t IsExcluded()              const { return fExcluded;  }  
   Bool_t IsFitValid()              const { return fFitValid;  }
-  Bool_t IsFitted()                const { return fFitted;  }
+  Bool_t IsFitted()                const { return fFitted;    }
   Bool_t IsBlindPixelMethodValid() const { return fBlindPixelMethodValid;  }
-  Bool_t IsFFactorMethodValid()    const { return fFFactorMethodValid;  }
-  Bool_t IsPINDiodeMethodValid()   const { return fPINDiodeMethodValid;  }
+  Bool_t IsFFactorMethodValid()    const { return fFFactorMethodValid;     }
+  Bool_t IsPINDiodeMethodValid()   const { return fPINDiodeMethodValid;    }
 
   // Charges
@@ -142,9 +145,10 @@
   }
 
-  void SetFitValid()                            { fFitValid = kTRUE;  }
-  void SetFitted()                              { fFitted = kTRUE;  }
-  void SetBlindPixelMethodValid(Bool_t b=kTRUE) { fBlindPixelMethodValid = b;  }
-  void SetFFactorMethodValid(Bool_t b=kTRUE)    { fFFactorMethodValid = b;  }
-  void SetPINDiodeMethodValid(Bool_t b=kTRUE)   { fPINDiodeMethodValid = b;  }
+  void SetExcluded(Bool_t b = kTRUE)            { fExcluded = b;   }  
+  void SetFitValid(Bool_t b = kTRUE)            { fFitValid = b;  }
+  void SetFitted(Bool_t b = kTRUE)             { fFitted   = b;  }
+  void SetBlindPixelMethodValid(Bool_t b = kTRUE)    { fBlindPixelMethodValid = b;  }
+  void SetFFactorMethodValid(Bool_t b = kTRUE)      { fFFactorMethodValid = b;  }
+  void SetPINDiodeMethodValid(Bool_t b = kTRUE)      { fPINDiodeMethodValid = b;  }
 
   // Unknown