Changeset 8478 for trunk/MagicSoft/Mars/mbadpixels

Timestamp:

05/09/07 13:15:53 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h

@@ -82 +82 @@
     Bool_t IsHardwareBad (HardwareType_t     typ) const { return fInfo[2]&typ; }
 
-    Bool_t IsUnsuitable() const { return fInfo[0]&kUnsuitable; }
-    Bool_t IsUnreliable() const { return fInfo[0]&kUnreliable; }
+    Bool_t IsUnsuitable() const   { return fInfo[0]&kUnsuitable; }
+    Bool_t IsUnreliable() const   { return fInfo[0]&kUnreliable; }
+    Bool_t IsUncalibrated() const { return fInfo[1]!=0; }
 
     Bool_t IsOK()  const { return fInfo[0]==0; }
@@ -100 +101 @@
       if (IsUncalibrated( kChargeIsPedestal    ))    return 1;
       if (IsUncalibrated( kLoGainSaturation    ))    return 2;
-      if (IsUncalibrated( kMeanTimeInFirstBin  ))    return 3;
-      if (IsUncalibrated( kMeanTimeInLast2Bins ))    return 4;
-      if (IsUncalibrated( kHiGainOverFlow      ))    return 5;
-      if (IsUncalibrated( kLoGainOverFlow      ))    return 6;
-      if (IsUncalibrated( kDeadPedestalRms     ))    return 7;
-      if (IsUncalibrated( kFluctuatingArrivalTimes)) return 8;
-      if (IsUncalibrated( kDeviatingNumPhes    ))    return 9;
-      if (IsUncalibrated( kDeviatingTimeResolution)) return 10;
-      if (IsUncalibrated( kLoGainBlackout      ))    return 11;
-      if (IsUncalibrated( kPreviouslyExcluded  ))    return 12;
-      return 13;
+//      if (IsUncalibrated( kMeanTimeInFirstBin  ))    return 3;
+//      if (IsUncalibrated( kMeanTimeInLast2Bins ))    return 4;
+      if (IsUncalibrated( kHiGainOverFlow      ))    return 3;
+      if (IsUncalibrated( kLoGainOverFlow      ))    return 4;
+      if (IsUncalibrated( kDeadPedestalRms     ))    return 5;
+      if (IsUncalibrated( kDeviatingNumPhes    ))    return 6;
+      if (IsUncalibrated( kFluctuatingArrivalTimes)) return 7;
+      if (IsUncalibrated( kDeviatingTimeResolution)) return 8;
+      if (IsUncalibrated( kLoGainBlackout      ))    return 9;
+      if (IsUncalibrated( kPreviouslyExcluded  ))    return 10;
+      return 11;
     }