Changeset 7035 for trunk/MagicSoft/Mars/mbadpixels

Timestamp:

05/13/05 21:25:26 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbadpixels

Files:

• MBadPixelsCalc.cc (modified) (3 diffs)
• MBadPixelsCam.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc

@@ -176 +176 @@
     for (Int_t i=0; i<entries; i++)
     {
+        if ((*fBadPixels)[i].IsUnsuitable())
+            continue;
+
         const Double_t rms = (*fPedPhotCam)[i].GetRms();
 
@@ -204 +207 @@
     for (Int_t i=0; i<entries; i++)
     {
+        if ((*fBadPixels)[i].IsUnsuitable())
+            continue;
+
         const Double_t rms = (*fPedPhotCam)[i].GetRms();
         const Byte_t  aidx = (*fGeomCam)[i].GetAidx();
 
         //Calculate the corrected means:
-        if (rms<=0.5*meanrms[aidx] || rms>=1.5*meanrms[aidx])
+        if (rms<=meanrms[aidx]/1.5 || rms>=meanrms[aidx]*1.5)
             continue;
 
@@ -250 +256 @@
     for (Int_t i=0; i<entries; i++)
     {
+        if ((*fBadPixels)[i].IsUnsuitable())
+            continue;
+
         const Double_t rms = (*fPedPhotCam)[i].GetRms();
         const Byte_t  aidx = (*fGeomCam)[i].GetAidx();

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

@@ -614 +614 @@
 // 23: MBadPixelsPix::IsUncalibrated(MBadPixelsPix::kHiGainOverFlow      )
 // 24: MBadPixelsPix::IsUncalibrated(MBadPixelsPix::kLoGainOverFlow      )
+// 102: MBadPixelsPix::IsUnsuitable()
 //
 Bool_t MBadPixelsCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
@@ -747 +748 @@
       val = 1;
       break;
+    case 102:
+      if  (!(*this)[idx].IsUnsuitable())
+          return kFALSE;
+      val = 1;
+      break;
     default:
       return kFALSE;