Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 4904)
+++ trunk/MagicSoft/Mars/Changelog	(revision 4905)
@@ -21,4 +21,7 @@
 
  2004/09/09: Markus Gaug
+ 
+   * mcalib/MCalibrationCam.[h,cc]
+     - make default for GetNumUnsuitable and GetNumUnreliable
 
    * mcalib/MCalibrationIntensityCam.[h,cc]
Index: trunk/MagicSoft/Mars/manalysis/MHPedestalCam.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MHPedestalCam.cc	(revision 4904)
+++ trunk/MagicSoft/Mars/manalysis/MHPedestalCam.cc	(revision 4905)
@@ -29,5 +29,5 @@
 //
 // Fills the extracted pedestals of MExtractedSignalCam into
-// the MHGausEvents-classes MHPedestalPix for every:
+// the MHCalibrationPix-classes MHPedestalPix for every:
 //
 // - Pixel, stored in the TObjArray's MHCalibrationCam::fHiGainArray
@@ -55,10 +55,10 @@
 // the fit is declared valid.
 // Otherwise, the fit is repeated within ranges of the previous mean
-// +- MHGausEvents::fPickupLimit (default: 5) sigma (see MHGausEvents::RepeatFit())
+// +- MHCalibrationPix::fPickupLimit (default: 5) sigma (see MHCalibrationPix::RepeatFit())
 // In case this does not make the fit valid, the histogram means and RMS's are
-// taken directly (see MHGausEvents::BypassFit()).
-//
-// Outliers of more than MHGausEvents::fPickupLimit (default: 5) sigmas
-// from the mean are counted as Pickup events (stored in MHGausEvents::fPickup)
+// taken directly (see MHCalibrationPix::BypassFit()).
+//
+// Outliers of more than MHCalibrationPix::fPickupLimit (default: 5) sigmas
+// from the mean are counted as Pickup events (stored in MHCalibrationPix::fPickup)
 //
 // The number of summed FADC slices is taken to re-normalize
@@ -341,10 +341,10 @@
 //
 // If MBadPixelsPix::IsBad():
-// - calls MHGausEvents::SetExcluded()
+// - calls MHCalibrationPix::SetExcluded()
 //
 // Calls:
 // - MHGausEvents::InitBins()
-// - MHGausEvents::ChangeHistId(i)
-// - MHGausEvents::SetEventFrequency(fPulserFrequency)
+// - MHCalibrationPix::ChangeHistId(i)
+// - MHCalibrationPix::SetEventFrequency(fPulserFrequency)
 // - MHPedestalPix::SetNSlices(nslices)
 //
@@ -401,6 +401,6 @@
   for (UInt_t i=0; i<npixels; i++)
   {
-      MHGausEvents &histhi = (*this)[i];
-      MHGausEvents &histlo = (*this)(i);
+      MHCalibrationPix &histhi = (*this)[i];
+      MHCalibrationPix &histlo = (*this)(i);
 
       if (histhi.IsExcluded())
@@ -431,8 +431,8 @@
   for (UInt_t j=0; j<nareas; j++)
     {
-      MHGausEvents &histhi = GetAverageHiGainArea(j);
+      MHCalibrationPix &histhi = GetAverageHiGainArea(j);
       histhi.FillHistAndArray(numareahi[j] == 0 ? 0. : sumareahi[j]/numareahi[j]);
 
-      MHGausEvents &histlo = GetAverageLoGainArea(j);
+      MHCalibrationPix &histlo = GetAverageLoGainArea(j);
       histlo.FillHistAndArray(numarealo[j] == 0 ? 0. : sumarealo[j]/numarealo[j]);
     }
@@ -440,8 +440,8 @@
   for (UInt_t j=0; j<nsectors; j++)
     {
-      MHGausEvents &histhi = GetAverageHiGainSector(j);
+      MHCalibrationPix &histhi = GetAverageHiGainSector(j);
       histhi.FillHistAndArray(numsectorhi[j] == 0 ? 0. : sumsectorhi[j]/numsectorhi[j]);
 
-      MHGausEvents &histlo = GetAverageLoGainSector(j);
+      MHCalibrationPix &histlo = GetAverageLoGainSector(j);
       histlo.FillHistAndArray(numsectorlo[j] == 0 ? 0. : sumsectorlo[j]/numsectorlo[j]);
     }
Index: trunk/MagicSoft/Mars/manalysis/MHPedestalPix.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MHPedestalPix.cc	(revision 4904)
+++ trunk/MagicSoft/Mars/manalysis/MHPedestalPix.cc	(revision 4905)
@@ -36,5 +36,5 @@
 // - Sigma Pedestal Error / slice = Sigma Pedestal Error / Sqrt (Number slices)
 // 
-//  Derives from MHGausEvents, fits the pedestals to a Gaussian and performs
+//  Derives from MHCalibrationPix, fits the pedestals to a Gaussian and performs
 //  a Fourier analysis.
 //
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 4904)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 4905)
@@ -266,9 +266,14 @@
 // the area index exceeds the initialized array.
 //
-const Int_t MCalibrationCam::GetNumUnsuitable( Int_t aidx ) const
-{
-  if (aidx < 0)
-    return -1;
-
+const Int_t MCalibrationCam::GetNumUnsuitable( const Int_t  aidx ) const
+{
+  if (aidx < 0)
+    {
+      Int_t num = 0;
+      for (Int_t i=0;i<fNumUnsuitable.GetSize();i++)
+        num += fNumUnsuitable[i];
+      return num;
+    }
+  
   return aidx > fNumUnsuitable.GetSize() ? -1 : fNumUnsuitable[aidx]; 
 }
@@ -279,8 +284,13 @@
 // the area index exceeds the initialized array.
 //
-const Int_t MCalibrationCam::GetNumUnreliable( Int_t aidx ) const
-{
-  if (aidx < 0)
-    return -1;
+const Int_t MCalibrationCam::GetNumUnreliable( const Int_t  aidx ) const
+{
+  if (aidx < 0)
+    {
+      Int_t num = 0;
+      for (Int_t i=0;i<fNumUnreliable.GetSize();i++)
+        num += fNumUnreliable[i];
+      return num;
+    }
 
   return aidx > fNumUnreliable.GetSize() ? -1 : fNumUnreliable[aidx]; 
@@ -292,5 +302,5 @@
 // the area index exceeds the initialized array.
 //
-const Float_t MCalibrationCam::GetNumHiGainFADCSlices( Int_t aidx ) const
+const Float_t MCalibrationCam::GetNumHiGainFADCSlices( const Int_t  aidx ) const
 {
   if (aidx < 0)
@@ -305,5 +315,5 @@
 // the area index exceeds the initialized array.
 //
-const Float_t MCalibrationCam::GetNumLoGainFADCSlices( Int_t aidx ) const
+const Float_t MCalibrationCam::GetNumLoGainFADCSlices( const Int_t  aidx ) const
 {
   if (aidx < 0)
@@ -368,5 +378,5 @@
 // Get i-th average pixel (area number)
 //
-MCalibrationPix &MCalibrationCam::GetAverageArea(UInt_t i)
+MCalibrationPix &MCalibrationCam::GetAverageArea(const UInt_t i)
 {
   return *static_cast<MCalibrationPix*>(fAverageAreas->UncheckedAt(i));
@@ -377,5 +387,5 @@
 // Get i-th average pixel (area number)
 //
-const MCalibrationPix &MCalibrationCam::GetAverageArea(UInt_t i) const 
+const MCalibrationPix &MCalibrationCam::GetAverageArea(const UInt_t i) const 
 {
   return *static_cast<MCalibrationPix*>(fAverageAreas->UncheckedAt(i));
@@ -386,5 +396,5 @@
 // Get i-th average pixel (sector number)
 //
-MCalibrationPix &MCalibrationCam::GetAverageSector(UInt_t i)
+MCalibrationPix &MCalibrationCam::GetAverageSector(const UInt_t i)
 {
   return *static_cast<MCalibrationPix*>(fAverageSectors->UncheckedAt(i));
@@ -395,5 +405,5 @@
 // Get i-th average pixel (sector number)
 //
-const MCalibrationPix &MCalibrationCam::GetAverageSector(UInt_t i) const 
+const MCalibrationPix &MCalibrationCam::GetAverageSector(const UInt_t i) const 
 {
   return *static_cast<MCalibrationPix*>(fAverageSectors->UncheckedAt(i));
@@ -404,5 +414,5 @@
 // Get i-th average pixel (area number)
 //
-MBadPixelsPix &MCalibrationCam::GetAverageBadArea(UInt_t i)
+MBadPixelsPix &MCalibrationCam::GetAverageBadArea(const UInt_t i)
 {
   return *static_cast<MBadPixelsPix*>(fAverageBadAreas->UncheckedAt(i));
@@ -413,5 +423,5 @@
 // Get i-th average pixel (area number)
 //
-const MBadPixelsPix &MCalibrationCam::GetAverageBadArea(UInt_t i) const 
+const MBadPixelsPix &MCalibrationCam::GetAverageBadArea(const UInt_t i) const 
 {
   return *static_cast<MBadPixelsPix*>(fAverageBadAreas->UncheckedAt(i));
@@ -422,5 +432,5 @@
 // Get i-th average pixel (sector number)
 //
-MBadPixelsPix &MCalibrationCam::GetAverageBadSector(UInt_t i)
+MBadPixelsPix &MCalibrationCam::GetAverageBadSector(const UInt_t i)
 {
   return *static_cast<MBadPixelsPix*>(fAverageBadSectors->UncheckedAt(i));
@@ -431,5 +441,5 @@
 // Get i-th average pixel (sector number)
 //
-const MBadPixelsPix &MCalibrationCam::GetAverageBadSector(UInt_t i) const 
+const MBadPixelsPix &MCalibrationCam::GetAverageBadSector(const UInt_t i) const 
 {
   return *static_cast<MBadPixelsPix*>(fAverageBadSectors->UncheckedAt(i));
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h	(revision 4904)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h	(revision 4905)
@@ -56,32 +56,34 @@
   
   void Clear           ( Option_t *o="");
-  void DrawPixelContent( Int_t num) const;
   void Copy(TObject& object) const;
   
+  void DrawPixelContent( Int_t num) const;
+
   // Getters
-  const Int_t            GetAverageAreas        ()             const;
-        MCalibrationPix &GetAverageArea         ( UInt_t i );
-  const MCalibrationPix &GetAverageArea         ( UInt_t i )   const;
-        MBadPixelsPix   &GetAverageBadArea      ( UInt_t i );
-  const MBadPixelsPix   &GetAverageBadArea      ( UInt_t i )   const;
-        MBadPixelsPix   &GetAverageBadSector    ( UInt_t i );
-  const MBadPixelsPix   &GetAverageBadSector    ( UInt_t i )   const;
-        MCalibrationPix &GetAverageSector       ( UInt_t i );
-  const Int_t            GetAverageSectors      ()             const;  
-  const MCalibrationPix &GetAverageSector       ( UInt_t i   ) const;
-  const Float_t          GetNumHiGainFADCSlices ( Int_t aidx=0 ) const;
-  const Float_t          GetNumLoGainFADCSlices ( Int_t aidx=0 ) const;
-  const Int_t            GetNumUnsuitable       ( Int_t aidx ) const;
-  const Int_t            GetNumUnreliable       ( Int_t aidx ) const;
+  const Int_t            GetAverageAreas        ()                     const;
+        MCalibrationPix &GetAverageArea         ( const UInt_t i     );
+  const MCalibrationPix &GetAverageArea         ( const UInt_t i     ) const;
+        MBadPixelsPix   &GetAverageBadArea      ( const UInt_t i     );
+  const MBadPixelsPix   &GetAverageBadArea      ( const UInt_t i     ) const;
+  const Int_t            GetAverageSectors      ()                     const;  
+        MCalibrationPix &GetAverageSector       ( const UInt_t i     );
+  const MCalibrationPix &GetAverageSector       ( const UInt_t i     ) const;  
+        MBadPixelsPix   &GetAverageBadSector    ( const UInt_t i     );
+  const MBadPixelsPix   &GetAverageBadSector    ( const UInt_t i     ) const;
+  const Float_t          GetNumHiGainFADCSlices ( const Int_t aidx=0 ) const;
+  const Float_t          GetNumLoGainFADCSlices ( const Int_t aidx=0 ) const;
+  const Int_t            GetNumUnsuitable       ( const Int_t aidx=-1) const;
+  const Int_t            GetNumUnreliable       ( const Int_t aidx=-1) const;
 
-  Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;
-  const PulserColor_t    GetPulserColor()                 const { return fPulserColor;         }
-  const Int_t            GetSize()                        const;
+        Bool_t           GetPixelContent        ( Double_t &val, Int_t idx, const MGeomCam &cam, 
+	                                          Int_t type=0       ) const;
+  const PulserColor_t    GetPulserColor         ()                     const { return fPulserColor; }
+  const Int_t            GetSize                ()                     const;
 
-        MCalibrationPix &operator[]          ( UInt_t i );
-  const MCalibrationPix &operator[]          ( UInt_t i ) const;
+        MCalibrationPix &operator[]             ( UInt_t i );
+  const MCalibrationPix &operator[]             ( UInt_t i )           const;
 
   // Inits
-  void  Init           ( const MGeomCam &geom         );
+  void  Init                   ( const MGeomCam &geom         );
   void  InitSize               ( const UInt_t i               );
   void  InitAverageAreas       ( const UInt_t i               );
@@ -91,6 +93,6 @@
   void  SetNumHiGainFADCSlices ( const Float_t f, const Int_t aidx=0 );
   void  SetNumLoGainFADCSlices ( const Float_t f, const Int_t aidx=0 );
-  void  SetNumUnsuitable       ( const UInt_t i,  const Int_t aidx );  
-  void  SetNumUnreliable       ( const UInt_t i,  const Int_t aidx ); 
+  void  SetNumUnsuitable       ( const UInt_t i,  const Int_t aidx   );  
+  void  SetNumUnreliable       ( const UInt_t i,  const Int_t aidx   ); 
   void  SetPulserColor         ( const PulserColor_t col=kCT1 )  { fPulserColor = col; }