Changeset 26630

Timestamp:

Jan 19, 2010, 3:02:59 PM (16 years ago)

Author:

eugene

Message:

only cull peaks which have not previously been assigned to a source

File:

• branches/eam_branches/20091201/psModules/src/objects/pmFootprintCullPeaks.c (modified) (1 diff)

branches/eam_branches/20091201/psModules/src/objects/pmFootprintCullPeaks.c

@@ -117 +117 @@
         psFree(peakFootprint);
 
-        // Check if any of the previous (brighter) peaks are within the footprint of this peak
-        // If so, the current peak is bogus; drop it.
+        // If this peak has not already been assigned to a source, then we can look for any
+        // brighter peaks within its footprint. Check if any of the previous (brighter) peaks
+        // are within the footprint of this peak If so, the current peak is bogus; drop it.
         bool keep = true;
-        for (int j = 0; keep && (j < brightPeaks->n); j++) {
+        for (int j = 0; keep && !peak->assigned && (j < brightPeaks->n); j++) {
             const pmPeak *peak2 = fp->peaks->data[j];
             int x2 = peak2->x - subImg->col0;
             int y2 = peak2->y - subImg->row0;
-            if (idImg->data.S32[y2][x2] == IN_PEAK)
+            if (idImg->data.S32[y2][x2] == IN_PEAK) {
                 // There's a brighter peak within the footprint above threshold; so cull our initial peak
                 keep = false;
+            }
         }
         if (!keep) {