Changeset 24695 for trunk/magic/censorObjects/src/censorReadout.c

Timestamp:

Jul 7, 2009, 10:32:49 AM (17 years ago)

Author:

eugene

Message:

working version of censorReadout

File:

• trunk/magic/censorObjects/src/censorReadout.c (modified) (5 diffs)

trunk/magic/censorObjects/src/censorReadout.c

@@ -1 +1 @@
 /** @file censorReadout.c
  *
- *  @brief reject detections that land within the magic mask regions
+ *  @brief reject detections that land within the streak mask regions
  *
  *  @ingroup censor
@@ -24 +24 @@
     }
 
-    psImageMaskType magicMaskValue = pmConfigMaskGet("MAGIC", config); // Mask value for magic pixels
+    psImageMaskType streakMaskValue = pmConfigMaskGet("STREAK", config); // Mask value for streak pixels
 
     psLogMsg ("censor", PS_LOG_INFO, "generating a bright-star mask");
@@ -37 +37 @@
     // XXX why not do this? 
     pmReadout *readoutMask = pmFPAviewThisReadout (view, inMask->fpa);
-    if (!readoutMask) continue;
+    if (!readoutMask) {
+        psError(CENSOR_ERR_CONFIG, true, "Can't find mask for this readout");
+        return false;
+    }
 
     // select the raw objects for this readout, flag is they fall in a mask
     psArray *inSources = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.SOURCES");
-    if (inSources == NULL) continue;
+    if (inSources == NULL) {
+        psError(CENSOR_ERR_CONFIG, true, "Can't find sources for this readout");
+        return false;
+    }
                 
     // create a replacement output array:
-    psArray *outSources = psAllocArrayEmpty(100);
+    psArray *outSources = psArrayAllocEmpty(100);
 
     // only keep sources that do not match the specified mask bit
@@ -61 +67 @@
         if (onChip) {
             psImageMaskType value = readoutMask->mask->data.PS_TYPE_IMAGE_MASK_DATA[yChip][xChip];
-            if (value & magicMaskValue) {
-                // skip sources on magic masks
+            if (value & streakMaskValue) {
+                // skip sources on streak masks
                 continue;
             }
@@ -69 +75 @@
     }
 
+    psLogMsg ("censor", PS_LOG_INFO, "keeping %ld of %ld sources", outSources->n, inSources->n);
+
     // remove the inSources and replace with the outSources
-    psMetadataRemove (readout->analysis, "PSPHOT.SOURCES");
+    psMetadataRemoveKey (readout->analysis, "PSPHOT.SOURCES");
     psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_DATA_ARRAY, "sources", outSources);
+    psFree (outSources);
 
     return true;