Changeset 33953 for branches/eam_branches/ipp-20120405/psphot/src/psphotMergeSources.c

Timestamp:

May 29, 2012, 5:16:09 PM (14 years ago)

Author:

eugene

Message:

changes from trunk

Location:

branches/eam_branches/ipp-20120405/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotMergeSources.c (modified) (1 diff)

branches/eam_branches/ipp-20120405/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)) {