Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3836)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3837)
@@ -37,4 +37,11 @@
    * mcalib/MCalibrationCam.h
      - make Init() and InitSize() virtual
+
+   * mcalib/MCalibrationChargeCam.[h,cc]
+     - introduce two TArrayI's for the number of uncalibrated and 
+       unreliable pixels.
+
+   * mcalib/MCalibrationChargeCalc.[h,cc]
+     - calculate and store the above numbers.
 
 
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.h	(revision 3836)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.h	(revision 3837)
@@ -6,8 +6,15 @@
 #endif
 
+#ifndef ROOT_TArrayI
+#include "TArrayI.h"
+#endif
+
 class MCalibrationChargeCam : public MCalibrationCam
 {
 private:
   
+  TArrayI fNumUncalibrated;
+  TArrayI fNumUnreliable;
+
   Byte_t  fFlags;                    // Bit-field to hold the flags
 
@@ -25,12 +32,19 @@
   // Getters
   Bool_t GetConversionFactorFFactor( Int_t ipx, Float_t &mean, Float_t &err, Float_t &ffactor );
+  Int_t  GetNumUncalibrated        ( const Int_t aidx) const   { return fNumUncalibrated[aidx]; }
+  Int_t  GetNumUnreliable          ( const Int_t aidx) const   { return fNumUnreliable  [aidx]; }
   Bool_t GetPixelContent           ( Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;
   Bool_t IsFFactorMethodValid()      const;
 
+  // Inits
+  void  Init                   ( const MGeomCam &geom         );
+  
   // Prints
   void   Print(Option_t *o="")         const;
 
   // Setters   
-  void   SetFFactorMethodValid (const Bool_t b=kTRUE );
+  void   SetFFactorMethodValid ( const Bool_t b=kTRUE );
+  void   SetNumUncalibrated    ( const Int_t i, const Int_t aidx)   { fNumUncalibrated[aidx] = i; }
+  void   SetNumUnreliable      ( const Int_t i, const Int_t aidx)   { fNumUnreliable  [aidx] = i; }
 
   ClassDef(MCalibrationChargeCam, 1) // Container Charge Calibration Results Camera