Changeset 4149 for trunk/MagicSoft

Timestamp:

05/24/04 17:06:31 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargeCam.cc (modified) (2 diffs)
• MCalibrationChargeCam.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

@@ -146 +146 @@
   SetFFactorMethodValid    ( kFALSE );
 
+  fNumPhotonsBlindPixelMethod    = 0.; 
+  fNumPhotonsFFactorMethod       = 0.; 
+  fNumPhotonsPINDiodeMethod      = 0.; 
+  fNumPhotonsBlindPixelMethodErr = 0.; 
+  fNumPhotonsFFactorMethodErr    = 0.;  
+  fNumPhotonsPINDiodeMethodErr   = 0.;  
+
   MCalibrationCam::Clear();
 
@@ -274 +281 @@
   }
   *fLog << all << endl;
-
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.h

@@ -14 +14 @@
 private:
   
-  Byte_t  fFlags;                    // Bit-field to hold the flags
+  Byte_t  fFlags;                       // Bit-field to hold the flags
 
+  Float_t fNumPhotonsBlindPixelMethod;    // Average nr. photons from Blind Pixel Method (Inner Pixel)
+  Float_t fNumPhotonsFFactorMethod;       // Average nr. photons from F-Factor Method (Inner Pixel)
+  Float_t fNumPhotonsPINDiodeMethod;      // Average nr. photons from PIN Diode Method (Inner Pixel)
+  Float_t fNumPhotonsBlindPixelMethodErr; // Error av. nr. photons from Blind Pixel Method
+  Float_t fNumPhotonsFFactorMethodErr;    // Error av. nr. photons from F-Factor Method
+  Float_t fNumPhotonsPINDiodeMethodErr;   // Error av. nr. photons from PIN Diode Method
+  
   enum  { kFFactorMethodValid };
 
@@ -28 +35 @@
 
   // Getters
-  Bool_t GetConversionFactorFFactor( Int_t ipx, Float_t &mean, Float_t &err, Float_t &ffactor );
-  Bool_t GetPixelContent           ( Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;
-  Bool_t IsFFactorMethodValid()      const;
+  Bool_t  GetConversionFactorFFactor( Int_t ipx, Float_t &mean, Float_t &err, Float_t &ffactor );
+  Bool_t  GetPixelContent           ( Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;
+
+  Float_t GetNumPhotonsBlindPixelMethod   () const { return fNumPhotonsBlindPixelMethod;    }
+  Float_t GetNumPhotonsFFactorMethod      () const { return fNumPhotonsFFactorMethod;       }     
+  Float_t GetNumPhotonsPINDiodeMethod     () const { return fNumPhotonsPINDiodeMethod;      }    
+  Float_t GetNumPhotonsBlindPixelMethodErr() const { return fNumPhotonsBlindPixelMethodErr; }
+  Float_t GetNumPhotonsFFactorMethodErr   () const { return fNumPhotonsFFactorMethodErr;    }     
+  Float_t GetNumPhotonsPINDiodeMethodErr  () const { return fNumPhotonsPINDiodeMethodErr;   }    
+  Bool_t  IsFFactorMethodValid            () const;
 
   // Inits
@@ -39 +53 @@
 
   // Setters   
-  void   SetFFactorMethodValid ( const Bool_t b=kTRUE );
-
+  void  SetFFactorMethodValid ( const Bool_t b=kTRUE );
+  void  SetNumPhotonsBlindPixelMethod ( const Float_t f )     { fNumPhotonsBlindPixelMethod    = f; } 
+  void  SetNumPhotonsFFactorMethod   ( const Float_t f )     { fNumPhotonsFFactorMethod       = f; }      
+  void  SetNumPhotonsPINDiodeMethod  ( const Float_t f )     { fNumPhotonsPINDiodeMethod      = f; }   
+  void  SetNumPhotonsBlindPixelMethodErr ( const Float_t f )  { fNumPhotonsBlindPixelMethodErr = f; } 
+  void  SetNumPhotonsFFactorMethodErr   ( const Float_t f )  { fNumPhotonsFFactorMethodErr    = f; }      
+  void  SetNumPhotonsPINDiodeMethodErr  ( const Float_t f )  { fNumPhotonsPINDiodeMethodErr   = f; }   
+  
   ClassDef(MCalibrationChargeCam, 1) // Container Charge Calibration Results Camera
 };