Changeset 28182 for trunk

Timestamp:

Jun 1, 2010, 3:57:49 PM (16 years ago)

Author:

Paul Price

Message:

Turn 'all images rejected' into bad quality instead of error.

Location:

trunk/ppStack/src

Files:

• ppStackConvolve.c (modified) (2 diffs)
• ppStackLoop.c (modified) (3 diffs)
• ppStackReject.c (modified) (1 diff)

trunk/ppStack/src/ppStackConvolve.c

@@ -235 +235 @@
 
     if (numGood == 0) {
-        psError(PPSTACK_ERR_REJECTED, false, "No good images to combine.");
+        options->quality = PPSTACK_ERR_REJECTED;
+        psErrorStackPrint(stderr, "No good images survived convolution stage.");
+        psErrorClear();
+        psWarning("No good images survived convolution stage.");
         psFree(fpaList);
         psFree(cellList);
-        return false;
+        return true;
     }
 
@@ -324 +327 @@
 
     if (numGood == 0) {
-        psError(PPSTACK_ERR_REJECTED, false, "No good images to combine.");
-        return false;
+        options->quality = PPSTACK_ERR_REJECTED;
+        psErrorStackPrint(stderr, "No good images survived convolution stage.");
+        psErrorClear();
+        psWarning("No good images survived convolution stage.");
+        return true;
     }
 

trunk/ppStack/src/ppStackLoop.c

@@ -91 +91 @@
     ppStackMemDump("convolve");
 
+    if (options->quality) {
+        // Can't do anything else
+        return true;
+    }
+
     // Ensure sufficient inputs
     {
@@ -97 +102 @@
         bool safe = psMetadataLookupBool(NULL, recipe, "SAFE"); // Be safe when combining
         if (safe && numGood <= 1) {
-            psError(PPSTACK_ERR_REJECTED, true, "Insufficient inputs for combination with safety on");
-            return false;
+            options->quality = PPSTACK_ERR_REJECTED;
+            psErrorStackPrint(stderr, "Insufficient inputs for combination with safety on");
+            psErrorClear();
+            psWarning("Insufficient inputs for combination with safety on");
+            return true;
         }
     }
@@ -147 +155 @@
         int numGood = stackSummary(options, "final combination");
         if (numGood <= 0) {
-            psError(PPSTACK_ERR_REJECTED, true, "Insufficient inputs for combination");
-            return false;
+            options->quality = PPSTACK_ERR_REJECTED;
+            psErrorStackPrint(stderr, "Insufficient inputs survived rejection stage");
+            psErrorClear();
+            psWarning("Insufficient inputs survived rejection stage");
+            return true;
         }
     }

trunk/ppStack/src/ppStackReject.c

@@ -166 +166 @@
     psFree(options->inspect); options->inspect = NULL;
 
-    if (numRejected >= num) {
-        psError(PPSTACK_ERR_REJECTED, true, "All inputs completely rejected; unable to proceed.");
-        return false;
-    }
-
     if (options->stats) {
         psMetadataAddS32(options->stats, PS_LIST_TAIL, "REJECT_IMAGES", 0,