Changeset 30752 for branches/eam_branches/ipp-20110213/psModules/src/objects/pmFootprintCullPeaks.c

Timestamp:

Feb 24, 2011, 12:47:58 PM (15 years ago)

Author:

eugene

Message:

culling was looking at the full list, not the bright peaks; nan pix values relative to threshold were ambiguous

File:

• branches/eam_branches/ipp-20110213/psModules/src/objects/pmFootprintCullPeaks.c (modified) (3 diffs)

branches/eam_branches/ipp-20110213/psModules/src/objects/pmFootprintCullPeaks.c

@@ -70 +70 @@
     // XXX test point
     // pmPeak *myPeak = fp->peaks->data[0];
-    // if ((fabs(myPeak->x - 320) < 30) && (fabs(myPeak->y - 430) < 30)) {
+    // if ((fabs(myPeak->x - 205) < 100) && (fabs(myPeak->y - 806) < 100)) {
     //  fprintf (stderr, "test peak\n");
     // }
@@ -138 +138 @@
         bool keep = true;
         for (int j = 0; keep && !peak->assigned && (j < brightPeaks->n); j++) {
-            const pmPeak *peak2 = fp->peaks->data[j];
+            // const pmPeak *peak2 = fp->peaks->data[j]; XXX isn't this an error?  we only care about the kept brighter peak, right?
+            const pmPeak *peak2 = brightPeaks->data[j];
             int x2 = peak2->x - subImg->col0;
             int y2 = peak2->y - subImg->row0;
@@ -150 +151 @@
             continue;
         }
-
         psArrayAdd (brightPeaks, 128, fp->peaks->data[i]);
     }