Changeset 13012 for trunk/psphot/src/psphotReadout.c

Timestamp:

Apr 24, 2007, 3:27:44 PM (19 years ago)

Author:

rhl

Message:

Added pmFootprint support

File:

• trunk/psphot/src/psphotReadout.c (modified) (4 diffs)

trunk/psphot/src/psphotReadout.c

@@ -20 +20 @@
     PS_ASSERT_PTR_NON_NULL (breakPt, false);
 
+    // Use the new pmFootprints approach?
+    const bool useFootprints = psMetadataLookupBool(NULL, recipe, "USE_FOOTPRINTS");
+
     // generate mask & weight images if they don't already exit
     if (!pmReadoutGenerateMaskWeight (readout, true)) {
@@ -58 +61 @@
 
     // find the peaks in the image
-    psArray *peaks = psphotFindPeaks (readout, recipe, 1);
+    psArray *peaks;
+    if (useFootprints) {
+       psArray *footprints = psphotFindPeaks (readout, recipe, useFootprints, 1);
+       peaks = pmFootprintArrayToPeaks(footprints);
+       psFree(footprints);
+    } else {
+       peaks = psphotFindPeaks (readout, recipe, useFootprints, 1);
+    }
+
     if (!peaks) {
         psLogMsg ("psphot", 3, "unable to find peaks in this image");
@@ -146 +157 @@
 
     // find the peaks in the image
-    psArray *newPeaks = psphotFindPeaks (readout, recipe, 2);
+    psArray *newPeaks;
+    if (useFootprints) {
+       psArray *newFootprints = psphotFindPeaks (readout, recipe, useFootprints, 2);
+
+       psphotCullPeaks(readout, recipe, newFootprints);
+
+       newPeaks = pmFootprintArrayToPeaks(newFootprints);
+
+       psFree(newFootprints);
+    } else {
+       newPeaks = psphotFindPeaks(readout, recipe, useFootprints, 2);
+    }
 
     // remove noise for subtracted objects
@@ -186 +208 @@
 
     // calculate source magnitudes
-    pmReadout *background = psphotSelectBackground (config, view);
+    pmReadout *background = psphotSelectBackground (config, view, false);
     psphotMagnitudes(sources, recipe, psf, background);