Changeset 28304 for branches/czw_branch/20100519/psModules/src/objects/pmSourceMatch.c

Timestamp:

Jun 10, 2010, 6:28:51 PM (16 years ago)

Author:

watersc1

Message:

Skycell Summary and stack Association stuff should be finished. I'll merge and do final tests on monday.

Location:

branches/czw_branch/20100519

Files:

• . (modified) (1 prop)
• psModules/src/objects/pmSourceMatch.c (modified) (3 diffs)

branches/czw_branch/20100519/psModules/src/objects/pmSourceMatch.c

@@ -280 +280 @@
     psFree(boundsMaster);
 
+    if (!matches) {
+        psError(PM_ERR_OBJECTS, true, "No matches made.");
+        return NULL;
+    }
+
     if (cullSingles) {
         // Now cull the matches that contain only a single star
@@ -300 +305 @@
     }
 
+    if (matches->n == 0) {
+        psError(PM_ERR_OBJECTS, true, "No matches made.");
+        psFree(matches);
+        return NULL;
+    }
+
     return matches;
 }
@@ -311 +322 @@
     psArray *matches = pmSourceMatchSources(sourceArrays, radius, false); // Source matches
     if (!matches) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to match source lists.");
+        psError(psErrorCodeLast(), false, "Unable to match source lists.");
         return NULL;
     }