Changeset 33910 for trunk

Timestamp:

May 24, 2012, 3:37:59 PM (14 years ago)

Author:

bills

Message:

Fix lingering duplicate source problem with psphotStack.
In psphotSourceChildren save the destination's footprint array
on the new container so that the footprints are available to be
merged with the footprints detected in pass 2. This allows
the duplicate peaks to be properly culled.

File:

• trunk/psphot/src/psphotMergeSources.c (modified) (1 diff)

trunk/psphot/src/psphotMergeSources.c

@@ -744 +744 @@
     psAssert (readoutOut, "missing readout?");
 
+    pmDetections *detectionsOutOld = psMetadataLookupPtr (&status, readoutOut->analysis, "PSPHOT.DETECTIONS");
+    psArray *oldFootprints = detectionsOutOld ? detectionsOutOld->footprints : NULL;
+
     // replace any existing DETECTION container on readoutOut->analysis with the new one
     pmDetections *detectionsOut = pmDetectionsAlloc();
+    if (oldFootprints) {
+        // ... but hang on to any existing footprints so that they can be merged with new footprints in pass 2
+        detectionsOut->footprints = psMemIncrRefCounter(oldFootprints);
+    }
     detectionsOut->allSources = psArrayAllocEmpty (100);
     if (!psMetadataAddPtr (readoutOut->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_META_REPLACE | PS_DATA_UNKNOWN, "psphot detections", detectionsOut)) {