Changeset 27086 for trunk/psModules/src/imcombine/pmSubtractionEquation.c

Timestamp:

Feb 25, 2010, 12:33:42 PM (16 years ago)

Author:

Paul Price

Message:

Fixing error codes for PSF-matching.

File:

• trunk/psModules/src/imcombine/pmSubtractionEquation.c (modified) (9 diffs)

trunk/psModules/src/imcombine/pmSubtractionEquation.c

@@ -7 +7 @@
 #include <pslib.h>
 
+#include "pmErrorCodes.h"
 #include "pmSubtraction.h"
 #include "pmSubtractionKernels.h"
@@ -718 +719 @@
     // Generate convolutions: these are generated once and saved
     if (!pmSubtractionConvolveStamp(stamp, kernels, footprint)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to convolve stamp %d.", index);
+        psError(psErrorCodeLast(), false, "Unable to convolve stamp %d.", index);
         return NULL;
     }
@@ -869 +870 @@
 
     if (!psThreadPoolWait(true)) {
-        psError(PS_ERR_UNKNOWN, false, "Error waiting for threads.");
+        psError(psErrorCodeLast(), false, "Error waiting for threads.");
         return false;
     }
@@ -989 +990 @@
             psStats *stats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN); // Statistics for norm
             if (!psVectorStats(stats, norms, NULL, NULL, 0)) {
-                psError(PS_ERR_UNKNOWN, false, "Unable to determine median normalisation");
+                psError(PM_ERR_DATA, false, "Unable to determine median normalisation");
                 psFree(stats);
                 psFree(sumMatrix);
@@ -1134 +1135 @@
             psStats *stats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN); // Statistics for norm
             if (!psVectorStats(stats, norms, NULL, NULL, 0)) {
-                psError(PS_ERR_UNKNOWN, false, "Unable to determine median normalisation");
+                psError(PM_ERR_DATA, false, "Unable to determine median normalisation");
                 psFree(stats);
                 psFree(sumMatrix);
@@ -1371 +1372 @@
                                                           false); // Kernel image
                 if (!image) {
-                    psError(PS_ERR_UNKNOWN, false, "Unable to generate image of kernel.");
+                    psError(psErrorCodeLast(), false, "Unable to generate image of kernel.");
                     return false;
                 }
@@ -1947 +1948 @@
             psVector *w = NULL;
             if (!psMatrixSVD (&U, &w, &V, kernelMatrix)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to perform SVD on sumMatrix\n");
+                psError(psErrorCodeLast(), false, "failed to perform SVD on sumMatrix\n");
                 return NULL;
             }
@@ -2087 +2088 @@
             psImage *luMatrix = psMatrixLUDecomposition(NULL, &permutation, sumMatrix);
             if (!luMatrix) {
-                psError(PS_ERR_UNKNOWN, true, "LU Decomposition of least-squares matrix failed.\n");
+                psError(PM_ERR_DATA, true, "LU Decomposition of least-squares matrix failed.\n");
                 psFree(solution);
                 psFree(sumVector);
@@ -2100 +2101 @@
             psFree(permutation);
             if (!solution) {
-                psError(PS_ERR_UNKNOWN, true, "Failed to solve the least-squares system.\n");
+                psError(PM_ERR_DATA, true, "Failed to solve the least-squares system.\n");
                 psFree(solution);
                 psFree(sumVector);