Changeset 17006 for trunk/ppStack/src/ppStackReadout.c

Timestamp:

Mar 17, 2008, 11:39:43 AM (18 years ago)

Author:

Paul Price

Message:

Reject an entire image if the fraction of rejected pixels exceeds a recipe-defined limit. Cleared out old recipe inputs.

File:

• trunk/ppStack/src/ppStackReadout.c (modified) (7 diffs)

trunk/ppStack/src/ppStackReadout.c

@@ -66 +66 @@
     }
 
-    if (!pmStackCombine(outRO, stack, maskBad, maskBlank, kernelSize, iter, combineRej, useVariance, safe)) {
+    if (!pmStackCombine(outRO, stack, maskBad, maskBlank, kernelSize, iter, combineRej, true,
+                        useVariance, safe)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts with rejection.");
         psFree(stack);
@@ -85 +86 @@
     for (int i = 0; i < stack->n; i++) {
         pmStackData *data = stack->data[i]; // Data for this image
-        psImage *inspected = psPixelsToMask(NULL, data->pixels,
+        psImage *inspected = psPixelsToMask(NULL, data->inspect,
                                             psRegionSet(0, outRO->image->numCols - 1,
                                                         0, outRO->image->numRows - 1),
@@ -105 +106 @@
         psMetadataAddPtr(readout->analysis, PS_LIST_TAIL, PPSTACK_INSPECT_PIXELS,
                          PS_DATA_PIXELS | PS_META_DUPLICATE_OK, "Pixels to inspect from initial combination",
-                         data->pixels);
-    }
-
+                         data->inspect);
+    }
     psFree(stack);
 
@@ -144 +144 @@
     psList *fpaList = psListAlloc(NULL); // List of input FPAs, for concept averaging
     psList *cellList = psListAlloc(NULL); // List of input cells, for concept averaging
+    int numGood = num;                  // Number of good inputs: images that haven't been completely rejected
     for (int i = 0; i < num; i++) {
+        if (!rejected->data[i]) {
+            // Image completely rejected
+            numGood--;
+            continue;
+        }
+
         pmReadout *ro = readouts->data[i];
         assert(ro);
@@ -201 +208 @@
 
         pmStackData *data = pmStackDataAlloc(ro, weighting);
-        data->pixels = psMemIncrRefCounter(rejected->data[i]);
+        data->reject = psMemIncrRefCounter(rejected->data[i]);
         stack->data[i] = data;
     }
@@ -212 +219 @@
                 continue;
             }
-            psImage *reject = psPixelsToMask(NULL, data->pixels,
+            psImage *reject = psPixelsToMask(NULL, data->reject,
                                              psRegionSet(0, outRO->image->numCols - 1,
                                                          0, outRO->image->numRows - 1),
@@ -227 +234 @@
 #endif
 
-    if (!pmStackCombine(outRO, stack, maskBad, maskBlank, 0, 0, NAN, useVariance, false)) {
+    if (!pmStackCombine(outRO, stack, maskBad, maskBlank, 0, 0, NAN, numGood != num, useVariance, false)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts.");
         psFree(fpaList);