Changeset 7012 for trunk

Timestamp:

05/11/05 18:50:42 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbadpixels/MBadPixelsCam.cc (modified) (3 diffs)
• mbadpixels/MBadPixelsPix.h (modified) (3 diffs)
• mbase/MStatusDisplay.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

@@ -448 +448 @@
   *fLog << endl;
   
+  PrintBadPixels(MBadPixelsPix::kPreviouslyExcluded,"Previously excluded");
   PrintBadPixels(MBadPixelsPix::kChargeIsPedestal,"Signal smaller 3 Pedestal RMS");
   PrintBadPixels(MBadPixelsPix::kChargeSigmaNotValid,"Signal smaller 3 Pedestal RMS");
@@ -458 +459 @@
   PrintBadPixels(MBadPixelsPix::kHiGainOverFlow,"High-Gain Histogram Overflow");
   PrintBadPixels(MBadPixelsPix::kLoGainOverFlow,"Low-Gain Histogram Overflow");
+  PrintBadPixels(MBadPixelsPix::kDeadPedestalRms,"Presumably dead from Ped. Rms");
+  PrintBadPixels(MBadPixelsPix::kFluctuatingArrivalTimes,"Fluctuating Pulse Arrival Times");
 
   *fLog << endl;
@@ -559 +562 @@
 
         (*this)[idx].SetUnsuitable(MBadPixelsPix::kUnsuitableRun);
+        (*this)[idx].SetUncalibrated(MBadPixelsPix::kPreviouslyExcluded);
     }
 }

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h

@@ -31 +31 @@
     // All types are initialized to normal behaviour
     enum UncalibratedType_t {
+      kPreviouslyExcluded       = BIT(0),
       kHiGainNotFitted          = BIT(1),
       kLoGainNotFitted          = BIT(2), 
@@ -52 +53 @@
       kLoGainOverFlow           = BIT(20),
       kHiLoNotFitted            = BIT(21),
-      kHiLoOscillating          = BIT(22)
+      kHiLoOscillating          = BIT(22),
+      kDeadPedestalRms          = BIT(23),
+      kFluctuatingArrivalTimes  = BIT(24)
     };
     
@@ -101 +104 @@
       if (IsUncalibrated( kHiGainOverFlow      )) return 7;
       if (IsUncalibrated( kLoGainOverFlow      )) return 8;
-      return 9;
+      if (IsUncalibrated( kDeadPedestalRms     )) return 9;
+      if (IsUncalibrated( kFluctuatingArrivalTimes )) return 10;
+      if (IsUncalibrated( kPreviouslyExcluded      )) return 11;
+      return 12;
     }
     

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 4/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2003-2004
+!   Copyright: MAGIC Software Development, 2003-2005
 !
 !
@@ -474 +474 @@
 
     // Add copyright notice
-    l = new TGLabel(f, "(c) MAGIC Software Development, 2000-2004");
+    l = new TGLabel(f, "(c) MAGIC Software Development, 2000-2005");
     fList->Add(l);
     f->AddFrame(l, layb);