Changeset 34772 for branches/czw_branch/20120906/psphot/src/psphotFindDetections.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/psphotFindDetections.c (modified) (3 diffs)

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

@@ -46 +46 @@
     psAssert (maskVal, "missing mask value?");
 
+    // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
+    psImageMaskType markVal = psMetadataLookupImageMask(&status, recipe, "MARK.PSPHOT"); // Mask value for bad pixels
+    psAssert (markVal, "missing mark value?");
+
+    maskVal |= markVal;
+
     // Use the new pmFootprints approach?
     const bool useFootprints = psMetadataLookupBool(NULL, recipe, "USE_FOOTPRINTS");
@@ -64 +70 @@
         psMemIncrRefCounter(detections); // so we can free the detections below
     }
+
+    // first pass vs other: if this is the first pass, the code will use PEAKS_NSIGMA_LIMIT and
+    // only attempt to detect PEAKS_NMAX entries.  If 'firstPass' is false, the code will
+    // attempt to replace the subtracted sources in order to measure the footprints.  After
+    // replacement, it is necessary to regenerate the significance image.  If no sources are
+    // available, the code will skip the significance image regeneration step.
 
     bool replaceSourcesForFootprints = false;
@@ -120 +132 @@
     if (useFootprints) {
         if (replaceSourcesForFootprints) {
+            bool modified = false;
             // subtract the noise for all sources including satstars
-            psphotAddOrSubNoiseReadout(config, view, filerule, index, recipe, false);
-            psphotReplaceAllSourcesReadout (config, view, filerule, index, recipe, false);
+            modified |= psphotAddOrSubNoiseReadout(config, view, filerule, index, recipe, false);
+            modified |= psphotReplaceAllSourcesReadout (config, view, filerule, index, recipe, false);
 
             // add in the satstars
-            psphotAddOrSubSatstarsReadout (config, view, filerule, index, recipe, true);
+            modified |= psphotAddOrSubSatstarsReadout (config, view, filerule, index, recipe, true);
 
-            psFree (significance);
-            significance = psphotSignificanceImage (readout, recipe, maskVal);
+            if (modified) {
+                psFree (significance);
+                significance = psphotSignificanceImage (readout, recipe, maskVal);
+            }
 
             // display the significance image