Changeset 4270

Timestamp:

06/03/04 10:23:59 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationCam.h (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -26 +26 @@
        like the RadialProfile functions, only with azimuth instead of 
        radius.
+
+   * mcalib/MCalibrationCam.[h,cc]
+     - replace fNumHiGainFADCSlices and fNumLoGainFADCSlices by a 
+       TArrayF and increment ClassDef by 1 for the streamer.
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h

@@ -10 +10 @@
 #ifndef ROOT_TArrayI
 #include "TArrayI.h"
+#endif
+#ifndef ROOT_TArrayF
+#include "TArrayF.h"
 #endif
 
@@ -27 +30 @@
 protected:
 
-  TArrayI fNumUnsuitable;
-  TArrayI fNumUnreliable;
+  TArrayI fNumUnsuitable;            // Number uncalibrated Pixels per area index 
+  TArrayI fNumUnreliable;            // Number unreliable   Pixels per area index 
 
-  Float_t fNumHiGainFADCSlices;      // Number High-Gain FADC slices used by extractor      
-  Float_t fNumLoGainFADCSlices;      // Number Low -Gain FADC slices used by extractor
+  TArrayF fNumHiGainFADCSlices;      // Number High-Gain FADC slices used by extractor      
+  TArrayF fNumLoGainFADCSlices;      // Number Low -Gain FADC slices used by extractor
   
   PulserColor_t fPulserColor;        // Colour of the pulsed LEDs
@@ -51 +54 @@
   
   // 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()         const { return fNumHiGainFADCSlices; }
-  const Float_t          GetNumLoGainFADCSlices()         const { return fNumLoGainFADCSlices; }  
-  const Int_t            GetNumUnsuitable   ( Int_t aidx) const;
-  const Int_t            GetNumUnreliable   ( Int_t aidx) const;
+  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 ) const;
+  const Float_t          GetNumLoGainFADCSlices ( Int_t aidx ) const;
+  const Int_t            GetNumUnsuitable       ( Int_t aidx ) const;
+  const Int_t            GetNumUnreliable       ( Int_t aidx ) const;
 
   virtual Bool_t         GetPixelContent     ( Double_t &val, Int_t idx, 
@@ -75 +78 @@
 
   // Inits
-  virtual void  Init                   ( const MGeomCam &geom         );
+  virtual void  Init           ( const MGeomCam &geom         );
   void  InitSize               ( const UInt_t i               );
   void  InitAverageAreas       ( const UInt_t i               );
@@ -81 +84 @@
 
   // Setters
-  void  SetNumHiGainFADCSlices ( const Float_t f              )  { fNumHiGainFADCSlices = f; }
-  void  SetNumLoGainFADCSlices ( const Float_t f              )  { fNumLoGainFADCSlices = f; }  
-  void  SetNumUnsuitable     ( const UInt_t i, const Int_t aidx);  
-  void  SetNumUnreliable      ( const UInt_t i, const Int_t aidx); 
+  void  SetNumHiGainFADCSlices ( const Float_t f, const Int_t aidx );
+  void  SetNumLoGainFADCSlices ( const Float_t f, 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; }
   
-  ClassDef(MCalibrationCam, 1)  // Base class Container for Calibration Results Camera
+  ClassDef(MCalibrationCam, 2)  // Base class Container for Calibration Results Camera
 };