Changeset 4679 for trunk

Timestamp:

08/18/04 10:20:23 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbadpixels

Files:

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

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

@@ -201 +201 @@
 // --------------------------------------------------------------------------
 //
+// Counts the number of neighbors matching NOT UnsuitableType type
+//
+Short_t MBadPixelsCam::GetNumSuitableNeighbors(MBadPixelsPix::UnsuitableType_t type, const MGeomPix &pix) const
+{
+    const Int_t n2 = pix.GetNumNeighbors();
+
+    Int_t cnt=0;
+    for (int j=0; j<n2; j++)
+    {
+        const Int_t id2 = pix.GetNeighbor(j);
+        if (!(*this)[id2].IsUnsuitable(type))
+            cnt++;
+    }
+
+    return cnt;
+}
+
+// --------------------------------------------------------------------------
+//
 // Calculate the number of pixels which are - under no circumstances -
 // interpolatable, called isolated. This means that a pixel (its own status
@@ -227 +246 @@
             continue;
 
-        const Int_t n2 = pix.GetNumNeighbors();
-
-        Int_t cnt=0;
-        for (int j=0; j<n2; j++)
-        {
-            const Int_t id2 = pix.GetNeighbor(j);
-            if (!(*this)[id2].IsUnsuitable(type))
-                cnt++;
-        }
-
-        if (cnt<2)
+        if (GetNumSuitableNeighbors(type, pix)<2)
             rc++;
     }
@@ -262 +271 @@
         return 0;
 
-    if (!(*this)[idx].IsUnsuitable(type))
+    if (GetNumSuitableNeighbors(type, *pix)>1)
         return 0;
 

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.h

@@ -9 +9 @@
 #endif
 
+class MGeomPix;
 class TClonesArray;
 
@@ -16 +17 @@
     TClonesArray *fArray; //-> 
 
+    Short_t GetNumSuitableNeighbors(MBadPixelsPix::UnsuitableType_t type, const MGeomPix &pix) const;
     Short_t GetNumMaxCluster(MBadPixelsPix::UnsuitableType_t type, TObjArray &list, Int_t idx, Int_t aidx) const;