Changeset 26982 for trunk/ppSub/src/ppSubThreshold.c

Timestamp:

Feb 17, 2010, 5:36:13 PM (16 years ago)

Author:

Paul Price

Message:

Being better about errors and their mapping to exit codes.

File:

• trunk/ppSub/src/ppSubThreshold.c (modified) (4 diffs)

trunk/ppSub/src/ppSubThreshold.c

@@ -45 +45 @@
     psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS);                               // Random number generator
     if (!psImageBackground(stats, NULL, subImage, subMask, maskIgnore, rng)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to determine threshold.");
+        psError(PPSUB_ERR_DATA, false, "Unable to determine threshold.");
         psFree(rng);
         psFree(stats);
@@ -97 +97 @@
     pmReadout *in = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.CONV"); // Input image
     if (!in) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find readout.");
+        psError(PPSUB_ERR_UNKNOWN, false, "Unable to find readout.");
         return false;
     }
@@ -103 +103 @@
     pmReadout *ref = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV"); // Reference image
     if (!ref) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find readout.");
+        psError(PPSUB_ERR_UNKNOWN, false, "Unable to find readout.");
         return false;
     }
@@ -114 +114 @@
         psRegion *region = regItem->data.V; // Region of interest
         if (!lowThreshold(in, thresh, maskVal, maskThresh, region, "input convolved image")) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to threshold input image.");
+            psError(psErrorCodeLast(), false, "Unable to threshold input image.");
             return false;
         }
         if (!lowThreshold(ref, thresh, maskVal, maskThresh, region, "reference convolved image")) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to threshold input image.");
+            psError(psErrorCodeLast(), false, "Unable to threshold input image.");
             return false;
         }