Changeset 4465 for trunk/MagicSoft/Mars

Timestamp:

08/04/04 14:13:50 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Oscar Blanch    12/2001 <mailto:blanch@ifae.es>
-!   Author(s): Thomas Bretz    08/2002 <mailto:tbretz@astro.uni.wuerzburg.de>
+!   Author(s): Oscar Blanch 12/2001 <mailto:blanch@ifae.es>
+!   Author(s): Thomas Bretz 08/2002 <mailto:tbretz@astro.uni.wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2004
 !
 !
@@ -91 +91 @@
 // --------------------------------------------------------------------------
 //
+// Returns the status of a pixel. If kSloppyTreatment is set a pixel must
+// be unsuitable to be treated. If not it is enough if it is unreliable
+// (IsBad() checks for any flag)
+//
+Bool_t MBadPixelsTreat::IsPixelBad(Int_t idx) const
+{
+    return TESTBIT(fFlags, kSloppyTreatment) ? (*fBadPixels)[idx].IsUnsuitable() : (*fBadPixels)[idx].IsBad();
+}
+
+// --------------------------------------------------------------------------
+//
 //  - Try to find or create MBlindPixels in parameter list.
 //  - get the MCerPhotEvt from the parlist (abort if missing)
@@ -156 +167 @@
         // Check whether pixel with idx i is blind
         //
-        if (pix && (*fBadPixels)[i].IsOK())
+        if (pix && !IsPixelBad(i))
             continue;
 
@@ -201 +212 @@
             // Do not use blind neighbors
             //
-            if ((*fBadPixels)[nidx].IsBad())
+            if (IsPixelBad(nidx))
                 continue;
 
@@ -263 +274 @@
         // Check whether pixel with idx i is blind
         //
-        if ((*fBadPixels)[i].IsOK())
+        if (!IsPixelBad(i))
             continue;
 
@@ -299 +310 @@
             // Do not use blind neighbors
             //
-            if ((*fBadPixels)[nidx].IsBad())
+            if (IsPixelBad(nidx))
                 continue;
 
@@ -513 +524 @@
         MCerPhotPix &pix = (*fEvt)[i];
 
-        if ((*fBadPixels)[pix.GetPixId()].IsBad())
+        if (IsPixelBad(pix.GetPixId()))
             pix.SetPixelUnmapped();
     }