Changeset 28304 for branches/czw_branch/20100519/ppStack/src/ppStackLoop.c

Timestamp:

Jun 10, 2010, 6:28:51 PM (16 years ago)

Author:

watersc1

Message:

Skycell Summary and stack Association stuff should be finished. I'll merge and do final tests on monday.

Location:

branches/czw_branch/20100519

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackLoop.c (modified) (3 diffs)

branches/czw_branch/20100519/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;
         }
     }