Changeset 35240

Timestamp:

Mar 5, 2013, 2:37:52 PM (13 years ago)

Author:

mhuber

Message:

adding CullSingles option to pmSourceMatchMerge for ppSubMatchPSFs select to only merge the matched sources for ppSub

Location:

trunk

Files:

• ppSub/src/ppSubMatchPSFs.c (modified) (1 diff)
• psModules/src/objects/pmSourceMatch.c (modified) (1 diff)
• psModules/src/objects/pmSourceMatch.h (modified) (1 diff)

trunk/ppSub/src/ppSubMatchPSFs.c

@@ -262 +262 @@
         lists->data[0] = psMemIncrRefCounter(inSources);
         lists->data[1] = psMemIncrRefCounter(refSources);
-        detections->allSources = pmSourceMatchMerge(lists, radius);
+        // XXX MEH changed to get only match (true to cull single), no apparent need of unmatched sources and can cause trouble
+        detections->allSources = pmSourceMatchMerge(lists, radius, true);
         psFree(lists);
         if (!detections->allSources) {

trunk/psModules/src/objects/pmSourceMatch.c

@@ -340 +340 @@
 
 
-psArray *pmSourceMatchMerge(psArray *sourceArrays, float radius)
+psArray *pmSourceMatchMerge(psArray *sourceArrays, float radius, bool cullSingles)
 {
     PS_ASSERT_ARRAY_NON_NULL(sourceArrays, NULL);
     PS_ASSERT_FLOAT_LARGER_THAN(radius, 0.0, NULL);
 
-    psArray *matches = pmSourceMatchSources(sourceArrays, radius, false); // Source matches
+    // XXX MEH - ppSub should only get matched list so cull true. merge refers to the picking of the first entry data for match
+    //psArray *matches = pmSourceMatchSources(sourceArrays, radius, false); // Source matches
+    psArray *matches = pmSourceMatchSources(sourceArrays, radius, cullSingles); // Source matches
     if (!matches) {
         psError(psErrorCodeLast(), false, "Unable to match source lists.");

trunk/psModules/src/objects/pmSourceMatch.h

@@ -68 +68 @@
 /// Sources are pulled from the lists into a new list, with no effort made to adjust them.
 psArray *pmSourceMatchMerge(psArray *sourceArrays, ///< Array of arrays of sources on each image
-                            float radius ///< Matching radius
+                            float radius, ///< Matching radius
+                            bool cullSingles ///< Cull "matches" with only a single source?
     );