Changeset 28119

Timestamp:

May 26, 2010, 3:34:01 PM (16 years ago)

Author:

Paul Price

Message:

Make inability to match source lists a data quality issue --- it means there were no sources in either list.

Location:

trunk

Files:

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

trunk/ppSub/src/ppSubMatchPSFs.c

@@ -243 +243 @@
         psFree(lists);
         if (!detections->allSources) {
-            psError(PPSUB_ERR_DATA, false, "Unable to merge source lists");
             psFree(detections);
-            return false;
+            psErrorCode error = psErrorCodeLast(); // Error code
+            if (error == PM_ERR_OBJECTS) {
+                psErrorStackPrint(stderr, "Unable to match source lists");
+                psWarning("Unable to match source lists --- suspect bad data quality.");
+                ppSubDataQuality(data, error, PPSUB_FILES_ALL);
+                return true;
+            } else {
+                psError(error, false, "Unable to merge source lists");
+                return false;
+            }
         }
     }

trunk/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;
     }