Changeset 24257

Timestamp:

May 26, 2009, 5:51:51 PM (17 years ago)

Author:

Paul Price

Message:

Adding new error code to treat bad data quality: SMALL_AREA = insufficient area for PSF-matching (triggers high masked pixel fraction in pmSubtractionMask)

Location:

trunk

Files:

• ppSub/src/ppSubMatchPSFs.c (modified) (1 diff)
• psModules/src/config/pmErrorCodes.dat (modified) (1 diff)
• psModules/src/imcombine/pmSubtractionMask.c (modified) (2 diffs)
• psModules/src/imcombine/pmSubtractionMatch.c (modified) (1 diff)

trunk/ppSub/src/ppSubMatchPSFs.c

@@ -166 +166 @@
             ppSubDataQuality(data, error, PPSUB_FILES_ALL);
             return true;
+        } else if (error == PM_ERR_SMALL_AREA) {
+            psErrorStackPrint(stderr, "Insufficient area for PSF matching");
+            psWarning("Insufficient area for PSF matching --- suspect bad data quality.");
+            ppSubDataQuality(data, error, PPSUB_FILES_ALL);
+            return true;
         } else {
             psError(PS_ERR_UNKNOWN, false, "Unable to match images.");

trunk/psModules/src/config/pmErrorCodes.dat

@@ -12 +12 @@
 SKY                     Problem in sky
 STAMPS                  Unable to select stamps for PSF-matching
+SMALL_AREA              Small area for PSF-matching
 # these errors correspond to standard exit conditions
 ARGUMENTS               Incorrect arguments

trunk/psModules/src/imcombine/pmSubtractionMask.c

@@ -6 +6 @@
 #include <pslib.h>
 
+#include "pmErrorCodes.h"
 #include "pmSubtraction.h"
 #include "pmSubtractionKernels.h"
@@ -78 +79 @@
         }
         if (numBad > badFrac * numCols * numRows) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+            psError(PM_ERR_SMALL_AREA, true,
                     "Fraction of bad pixels (%d/%d=%f) exceeds limit (%f)\n",
                     numBad, numCols * numRows, (float)numBad/(float)(numCols * numRows), badFrac);

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -246 +246 @@
                                          badFrac, mode); // Subtraction mask
     if (!subMask) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to generate subtraction mask.");
+        psError(psErrorCodeLast(), false, "Unable to generate subtraction mask.");
         psFree(kernels);
         psFree(regions);