Changeset 4905 for trunk/MagicSoft/Mars/mcalib

Timestamp:

09/09/04 17:43:22 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationCam.cc (modified) (12 diffs)
• MCalibrationCam.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

@@ -266 +266 @@
 // 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 +284 @@
 // 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 +302 @@
 // 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 +315 @@
 // 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 +378 @@
 // 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 +387 @@
 // 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 +396 @@
 // 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 +405 @@
 // 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 +414 @@
 // 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 +423 @@
 // 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 +432 @@
 // 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 +441 @@
 // 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));

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h

@@ -56 +56 @@
   
   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 +93 @@
   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; }