Changeset 4793 for trunk/MagicSoft/Mars/mbadpixels

Timestamp:

08/29/04 17:04:39 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbadpixels

Files:

• MBadPixelsCam.cc (modified) (2 diffs)
• MBadPixelsPix.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

@@ -616 +616 @@
 // 21: MBadPixelsPix::IsUncalibrated(MBadPixelsPix::kRelTimeOscillating  )
 // 22: MBadPixelsPix::IsUncalibrated(MBadPixelsPix::kDeviatingNumPhots   )
+// 23: MBadPixelsPix::IsUncalibrated(MBadPixelsPix::kHiGainOverFlow      )
+// 24: MBadPixelsPix::IsUncalibrated(MBadPixelsPix::kLoGainOverFlow      )
 //
 Bool_t MBadPixelsCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
@@ -739 +741 @@
       val = 1;
       break;
+    case 23:
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainOverFlow    ))
+        return kFALSE;
+      val = 1;
+      break;
+    case 24:
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainOverFlow   ))
+        return kFALSE;
+      val = 1;
+      break;
     default:
       return kFALSE;

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h

@@ -90 +90 @@
 
     Int_t  GetUnsuitableCalibration() const   {
-      if (!IsUnsuitable()) return 0;
+      if (!IsUnsuitable())                        return 0;
       if (IsUncalibrated( kChargeIsPedestal    )) return 1;
       if (IsUncalibrated( kChargeRelErrNotValid)) return 2;
@@ -105 +105 @@
     
     Int_t  GetUnreliableCalibration() const   {
-      if (!IsUnreliable()) return 0;
+      if (!IsUnreliable() || IsUnsuitable())      return 0;
       if (IsUncalibrated( kChargeSigmaNotValid )) return 1;
       if (IsUncalibrated( kHiGainNotFitted     )) return 2;