Changeset 30621 for trunk/psModules/src/objects/pmFootprintAssignPeaks.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)
• pmFootprintAssignPeaks.c (modified) (4 diffs)

trunk/psModules/src/objects/pmFootprintAssignPeaks.c

@@ -24 +24 @@
 /*
  * Given a psArray of pmFootprints and another of pmPeaks, assign the peaks to the
- * footprints in which that fall; if they _don't_ fall in a footprint, add a suitable
+ * footprints in which they fall; if they _don't_ fall in a footprint, add a suitable
  * one to the list.
  */
@@ -83 +83 @@
 
         // XXX are we allowed to have peak-less footprints??
-        if (!fp->peaks->n) continue;
+        if (fp->peaks->n == 0) continue;
+        if (fp->peaks->n == 1) continue;
 
         fp->peaks = psArraySort(fp->peaks, pmPeakSortBySN);
 
+        // XXX check for an assert on duplicates (I don't think they can happen, but
+        // let's double check for now)
+
+        for (int j = 1; j < fp->peaks->n; j++) {
+            psAssert (fp->peaks->data[j] != fp->peaks->data[j-1], "duplicate peak!");
+        }
+        continue;
+
+        // XXX WHY am I culling duplicates?  how can there be duplicates?
         // XXX EAM : the algorithm below should be much faster than using psArrayRemove if
         // the number of peaks in the footprint is large, or if there are no duplicates.
@@ -93 +103 @@
 
         // track the number of good peaks in the footprint
-        int nGood = 1;
+        int lastGood = 0;
 
         // check for duplicates
@@ -100 +110 @@
         // (if sorted list has A, B, A, B ...)
         for (int j = 1; j < fp->peaks->n; j++) { 
-            if (fp->peaks->data[j] == fp->peaks->data[nGood]) {
+            if (fp->peaks->data[j] == fp->peaks->data[lastGood]) {
                 // everything on the array has its own mem reference; free and drop this one
                 psFree (fp->peaks->data[j]);
                 fp->peaks->data[j] = NULL;
             } else {
-                nGood ++;
+                lastGood ++;
             }
         }
+        int nGood = lastGood + 1;
 
         // no deleted peaks, go to next footprint