Changeset 4637 for trunk/MagicSoft/Mars/mbadpixels

Timestamp:

08/16/04 18:20:35 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbadpixels

Files:

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

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

@@ -446 +446 @@
 // 4: MBadPixelsPix::IsHiGainBad()
 // 5: MBadPixelsPix::IsLoGainBad()
+// 6: MBadPixelsPix::GetUnsuitableCalibration()
+// 7: MBadPixelsPix::GetUnreliableCalibration()
 // 8: MBadPixelsPix::IsUncalibrated(MBadPixelsPix::kHiGainNotFitted)
 // 9: MBadPixelsPix::IsUncalibrated(MBadPixelsPix::kLoGainNotFitted)
@@ -501 +503 @@
         return kFALSE;
       break;
+    case 6:
+      if  ((*this)[idx].GetUnsuitableCalibration())
+        val = (*this)[idx].GetUnsuitableCalibration();
+      else
+        return kFALSE;
+      break;
+    case 7:
+      if  ((*this)[idx].GetUnreliableCalibration())
+        val = (*this)[idx].GetUnreliableCalibration();
+      else
+        return kFALSE;
+      break;
     case 8:
       if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainNotFitted))

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc

@@ -52 +52 @@
 // BIT(5 ): kLoGainOscillating   :  The Low  Gain signals fourier transform showed abnormal behavior  
 // BIT(6 ): kRelTimeOscillating  :  The High Gain arrival times fourier transform showed abnormal behavior  
-// BIT(7 ): kLoGainSaturation    :  The Low  Gain signals were saturated during calibration
 //
 // * Set bits leading to an unsuitable flag:
 //
+// BIT(7 ): kLoGainSaturation    :  The Low  Gain signals were saturated during calibration
 // BIT(8 ): kChargeIsPedestal    :  The calibration signal contained only pedestals - presumably dead pixel
 // BIT(9 ): kChargeErrNotValid   :  The absolute error of the derived charge has given non-sense - presumably pedestal

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h

@@ -87 +87 @@
                                      || IsUncalibrated(kHiGainOscillating  ) ; }
 
+    Int_t  GetUnsuitableCalibration() const   {
+      if (!IsUnsuitable()) return 0;
+      if (IsUncalibrated( kChargeIsPedestal    )) return 1;
+      if (IsUncalibrated( kChargeRelErrNotValid)) return 2;
+      if (IsUncalibrated( kChargeSigmaNotValid )) return 3;
+      if (IsUncalibrated( kLoGainSaturation    )) return 4;
+      if (IsUncalibrated( kMeanTimeInFirstBin  )) return 5;
+      if (IsUncalibrated( kMeanTimeInLast2Bins )) return 6;
+      if (IsUncalibrated( kDeviatingNumPhes    )) return 7;
+      if (IsUncalibrated( kDeviatingFFactor    )) return 8;
+      if (IsUncalibrated( kDeviatingNumPhots   )) return 9;
+    }
+    
+    Int_t  GetUnreliableCalibration() const   {
+      if (!IsUnreliable()) return 0;
+      if (IsUncalibrated( kHiGainNotFitted   )) return 1;
+      if (IsUncalibrated( kLoGainNotFitted   )) return 2;
+      if (IsUncalibrated( kRelTimeNotFitted  )) return 3;
+      if (IsUncalibrated( kHiGainOscillating )) return 4;
+      if (IsUncalibrated( kLoGainOscillating )) return 5;
+      if (IsUncalibrated( kRelTimeOscillating)) return 6;
+    }
+    
+        
+    
     void Merge(const MBadPixelsPix &pix);