Changeset 21519 for trunk/psphot/src/psphotSourceSize.c

Timestamp:

Feb 16, 2009, 12:34:24 PM (17 years ago)

Author:

eugene

Message:

added additional flag values, threaded functions always use the threaded version

File:

• trunk/psphot/src/psphotSourceSize.c (modified) (6 diffs)

trunk/psphot/src/psphotSourceSize.c

@@ -56 +56 @@
 
         // source must have been subtracted
-        if (!(source->mode & PM_SOURCE_MODE_SUBTRACTED)) {
+        if (!(source->tmpFlags & PM_SOURCE_TMPF_SUBTRACTED)) {
+            source->mode |= PM_SOURCE_MODE_SIZE_SKIPPED;
             psTrace("psphot", 7, "Not calculating extNsigma,crNsigma since source is not subtracted\n");
             continue;
@@ -63 +64 @@
         psF32 **resid  = source->pixels->data.F32;
         psF32 **variance = source->variance->data.F32;
-        psImageMaskType **mask    = source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA;
+        psImageMaskType **mask = source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA;
 
         // check for extendedness: measure the delta flux significance at the 1 sigma contour
@@ -82 +83 @@
         if (xPeak < 1 || xPeak > source->pixels->numCols - 2 ||
             yPeak < 1 || yPeak > source->pixels->numRows - 2) {
+            source->mode |= PM_SOURCE_MODE_SIZE_SKIPPED;
             psTrace("psphot", 7, "Not calculating crNsigma due to edge\n");
             continue;
@@ -98 +100 @@
         if (!keep) {
             psTrace("psphot", 7, "Not calculating crNsigma due to masked pixels\n");
+            source->mode |= PM_SOURCE_MODE_SIZE_SKIPPED;
             continue;
         }
@@ -156 +159 @@
         }
         source->crNsigma  = (nCR > 0)  ? fCR / nCR : 0.0;
-        if (!isfinite(source->crNsigma)) continue;
+        if (!isfinite(source->crNsigma)) {
+            continue;
+        }
 
         // this source is thought to be a cosmic ray.  flag the detection and mask the pixels
@@ -264 +269 @@
     // replace the source flux
     pmSourceAdd (source, PM_MODEL_OP_FULL, maskVal);
-    source->mode &= ~PM_SOURCE_MODE_SUBTRACTED;
+    source->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
 
     // flag this as a CR