Changeset 34772 for branches/czw_branch/20120906/psphot/src/psphotReplaceUnfit.c

Timestamp:

Dec 6, 2012, 6:32:19 PM (14 years ago)

Author:

watersc1

Message:

merge from trunk. Preliminary versions of stacktool/warptool updates and regenerate_background.pl script. The warp code is finished and tested, and I still need to get the stack version resolved.

Location:

branches/czw_branch/20120906/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotReplaceUnfit.c (modified) (3 diffs)

branches/czw_branch/20120906/psphot/src/psphotReplaceUnfit.c

@@ -35 +35 @@
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
-        if (!psphotReplaceAllSourcesReadout (config, view, filerule, i, recipe, ignoreState)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to replace all sources for %s entry %d", filerule, i);
-            return false;
-        }
-    }
-    return true;
-}
-
+        // ignore return value. False means "sources not subtracted", not a failure condition
+        (void) psphotReplaceAllSourcesReadout (config, view, filerule, i, recipe, ignoreState);
+    }
+    return true;
+}
+
+// the return state indicates if any sources were actually replaced
 bool psphotReplaceAllSourcesReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe, bool ignoreState) {
 
@@ -58 +57 @@
     if (psMetadataLookupBool (&status, readout->analysis, "PSPHOT.SKIP.INPUT")) {
         psLogMsg ("psphot", PS_LOG_DETAIL, "skipping replace all sources for input file %d", index);
-        return true;
+        return false;
     }
 
@@ -65 +64 @@
 
     psArray *sources = detections->allSources;
-    //psAssert (sources, "missing sources?");
-    if (!sources) return true;
+    // if no work to do, should just return false
+    if (!sources) return false;
 
     // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)