Changeset 30621 for trunk/psModules/src/objects/pmFootprintCullPeaks.c

Timestamp:

Feb 13, 2011, 11:59:42 AM (15 years ago)

Author:

eugene

Message:

do not cull peaks with only one entry; skip the section that culls duplicate peaks -- this was dropping many valid peaks and seems unneeded; save radial apertures in their own extension; fixed logic on culling of faint peaks

Location:

trunk/psModules/src/objects

Files:

• . (modified) (1 prop)
• pmFootprintCullPeaks.c (modified) (3 diffs)

trunk/psModules/src/objects/pmFootprintCullPeaks.c

@@ -28 +28 @@
   * Examine the peaks in a pmFootprint, and throw away the ones that are not sufficiently
   * isolated.  More precisely, for each peak find the highest coll that you'd have to traverse
-  * to reach a still higher peak --- and if that coll's more than nsigma DN below your
+  * to reach a still higher peak --- and if that coll's more (less?) than nsigma DN below your
   * starting point, discard the peak.
   */
@@ -99 +99 @@
         float threshold = flux - nsigma_delta*stdev_pad;
 
-        if (isnan(threshold) || threshold < min_threshold) {
+        if (isnan(threshold)) {
             // min_threshold is assumed to be below the detection threshold,
             // so all the peaks are pmFootprint, and this isn't the brightest
@@ -109 +109 @@
             threshold = subImg->data.F32[y][x] - 10*FLT_EPSILON;
         }
+
+        if (threshold < min_threshold) {
+            threshold = min_threshold;
+        }
 
         // init peakFootprint here?