Changeset 5457 for trunk

Timestamp:

11/23/04 09:39:49 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationPix.h (modified) (7 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/11/22: Markus Gaug
+
+   * mcalib/MCalibrationPix.h
+     - new data member fHiGainRms and fLoGainRms requested by Florian  
+       a long time ago to be used for the data check.
+     - set the version number from 1 to 2.
+
+   * mcalib/MCalibrationChargeCam.cc
+     - introduced new flag in GetPixelContent which returns the RMS  
+       divided by mean, to be called by MJCalibration in the datacheck.
+
 
  2004/11/22: Marcos Lopez

trunk/MagicSoft/Mars/mcalib/MCalibrationPix.h

@@ -16 +16 @@
   Float_t fHiGainNumBlackout; // Number blackout events in high-gain
   Float_t fHiGainNumPickup;   // Number pickup events in high-gain
+  Float_t fHiGainRms;         // Histogram RMS of the high gain values
   Float_t fHiGainSigma;       // Sigma from fit to high gain values
   Float_t fHiGainSigmaVar;    // Error of sigma from fit to high gain values
@@ -23 +24 @@
   Float_t fLoGainNumBlackout; // Number blackout events in low-gain
   Float_t fLoGainNumPickup;   // Number pickup events in low-gain
+  Float_t fLoGainRms;         // Histogram RMS of the low-gain values  
   Float_t fLoGainSigma;       // Sigma of from fit to low gain values
   Float_t fLoGainSigmaVar;    // Error of sigma from fit to low gain values
@@ -45 +47 @@
   void SetHiGainNumPickup   ( const Float_t f ) { fHiGainNumPickup   = f; }
   void SetHiGainProb        ( const Float_t f ) { fHiGainProb        = f; }
-  void SetHiGainSigma       ( const Float_t f ) { fHiGainSigma       = f; }
+  void SetHiGainRms         ( const Float_t f ) { fHiGainRms         = f; }
+  void SetHiGainSigma       ( const Float_t f ) { fHiGainSigma       = f; }  
   void SetHiGainSigmaVar    ( const Float_t f ) { fHiGainSigmaVar    = f; }
   void SetLoGainMean        ( const Float_t f ) { fLoGainMean        = f; }
@@ -52 +55 @@
   void SetLoGainNumPickup   ( const Float_t f ) { fLoGainNumPickup   = f; }
   void SetLoGainProb        ( const Float_t f ) { fLoGainProb        = f; }
+  void SetLoGainRms         ( const Float_t f ) { fLoGainRms         = f; }
   void SetLoGainSigma       ( const Float_t f ) { fLoGainSigma       = f; }
   void SetLoGainSigmaVar    ( const Float_t f ) { fLoGainSigmaVar    = f; }
@@ -72 +76 @@
   Float_t GetHiGainMeanRelVar () const;
   Float_t GetHiGainProb       () const { return fHiGainProb   ;     }
+  Float_t GetHiGainRms        () const { return fHiGainRms    ;     }  
   Float_t GetHiGainSigma      () const { return fHiGainSigma  ;     }
   Float_t GetHiGainSigmaErr   () const;
@@ -85 +90 @@
   virtual Float_t GetLoGainMeanRelVar () const;  
   virtual Float_t GetLoGainProb       () const { return fLoGainProb;        }
-  virtual Float_t GetLoGainSigma      () const { return fLoGainSigma;       }
+  virtual Float_t GetLoGainRms        () const { return fLoGainRms  ;       }
+  virtual Float_t GetLoGainSigma      () const { return fLoGainSigma;       }  
   virtual Float_t GetLoGainSigmaErr   () const;
   virtual Float_t GetLoGainNumPickup  () const { return fLoGainNumPickup;   }
@@ -107 +113 @@
   Bool_t  IsValid   ()         const;
 
-  ClassDef(MCalibrationPix, 1)  // Base Container for Calibration Results Pixel
+  ClassDef(MCalibrationPix, 2)  // Base Container for Calibration Results Pixel
 };