Changeset 4787 for trunk/MagicSoft/Mars

Timestamp:

08/29/04 15:39:50 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbadpixels/MBadPixelsPix.cc (modified) (1 diff)
• mbadpixels/MBadPixelsPix.h (modified) (2 diffs)
• mcalib/MCalibrationChargePix.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/08/29: Markus Gaug
+ 
+  * mbadpixels/MBadPixelsPix.[h,cc] 
+    - introduced new calibration bits: kHiGainOverFlow 
+      and kLoGainOverFlow being filled when the calibration histograms 
+      overflow. Will cause an kUnsuitableRun afterwards. 
+
+
  2004/08/27: Florian Goebel
 
@@ -26 +34 @@
  2004/08/27: Hendrik Bartko
 
-  * msignal/MExtractTime.cc
-    - check that the pixel has a low gain before calculating the time 
-      for the low gain in case of a saturated high gain.
+   * msignal/MExtractTime.cc
+     - check that the pixel has a low gain before calculating the time 
+       for the low gain in case of a saturated high gain.
 
  2004/08/27: Markus Gaug

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc

@@ -65 +65 @@
 // BIT(15): kDeviatingNumPhots   :  The calculated number of calibrated photons deviates too much from the mean - inconsistency
 // BIT(16): kDeviatingFFactor    :  The calculated overall F-Factor deviates too much from the mean - inconsistency
+// BIT(19): kHiGainOverFlow      :  The Hi-Gain calibration histogram showed overflow without saturating the FADC
+// BIT(20): kLoGainOverFlow      :  The Lo-Gain calibration histogram showed overflow 
+//
 //
 // * Set bits leading to not useable low-gain signal:

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h

@@ -48 +48 @@
       kDeviatingFFactor         = BIT(16),
       kDeviatingTimeResolution  = BIT(17),
-      kConversionHiLoNotValid   = BIT(18)
+      kConversionHiLoNotValid   = BIT(18),
+      kHiGainOverFlow           = BIT(19),
+      kLoGainOverFlow           = BIT(20)
     };
     
@@ -98 +100 @@
       if (IsUncalibrated( kDeviatingFFactor    )) return 8;
       if (IsUncalibrated( kDeviatingNumPhots   )) return 9;
-      return 10;
+      if (IsUncalibrated( kHiGainOverFlow      )) return 10;
+      if (IsUncalibrated( kLoGainOverFlow      )) return 11;
+      return 12;
     }
     

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

@@ -823 +823 @@
   if (fPheFFactorMethodVar < 0. )
     return kFALSE;
-  
+
+  return kTRUE;
 }