Changeset 26633

Timestamp:

Jan 19, 2010, 3:06:48 PM (16 years ago)

Author:

eugene

Message:

we were not merging the old footprints with the new footprints -- this did not mess up the sources, but the culled footprints were being freed

File:

• branches/eam_branches/20091201/psphot/src/psphotFindFootprints.c (modified) (3 diffs)

branches/eam_branches/20091201/psphot/src/psphotFindFootprints.c

@@ -41 +41 @@
     if (pass == 2) {
         // merge in old peaks;
-        const int includePeaks = 0x0 | 0x2; // i.e. just from newFootprints
-
-        // XXX EAM : still not sure I understand this: are we double-couning or undercounting peaks
+        const int includePeaks = 0x1 | 0x2; // i.e. both new and old footprints
 
         psArray *mergedFootprints = pmFootprintArraysMerge(detections->footprints, footprints, includePeaks);
@@ -50 +48 @@
         psFree(footprints);
         psFree(detections->footprints);
+
+        // replace the merged footprints on the detection structure
         detections->footprints = mergedFootprints;
     } else {
@@ -61 +61 @@
     return detections;
 }
+
+bool psphotCheckFootprints (pmDetections *detections) {
+
+    // check for messed up footprints in the old peaks
+    for (int i = 0; i < detections->oldPeaks->n; i++) {
+        pmPeak *peak = detections->oldPeaks->data[i];
+        pmFootprint *footprint = peak->footprint;
+        if (!footprint) continue;
+        for (int j = 0; j < footprint->spans->n; j++) {
+            pmSpan *sp = footprint->spans->data[j];
+            psAssert (sp, "missing span");
+        }
+    }
+    return true;
+}