Changeset 27319 for trunk/ppStack/src/ppStackReject.c

Timestamp:

Mar 18, 2010, 12:01:15 PM (16 years ago)

Author:

Paul Price

Message:

Reworking ppStack to not grow the rejected pixels for the unconvolved stack. Also working with convolved and unconvolved stacks separately, so they don't have to be in memory at the same time. This should reduce the memory usage of ppStack.

File:

• trunk/ppStack/src/ppStackReject.c (modified) (4 diffs)

trunk/ppStack/src/ppStackReject.c

@@ -31 +31 @@
 
     float threshold = psMetadataLookupF32(NULL, recipe, "THRESHOLD.MASK"); // Threshold for mask deconvolution
-    float poorFrac = psMetadataLookupF32(NULL, recipe, "POOR.FRACTION"); // Fraction for "poor"
     float imageRej = psMetadataLookupF32(NULL, recipe, "IMAGE.REJ"); // Maximum fraction of image to reject
                                                                      // before rejecting entire image
@@ -109 +108 @@
 
         psPixels *reject = pmStackReject(options->inspect->data[i], options->numCols, options->numRows,
-                                         threshold, poorFrac, stride, options->regions->data[i],
+                                         threshold, stride, options->regions->data[i],
                                          options->kernels->data[i]); // Rejected pixels
 
@@ -130 +129 @@
                 options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i] |= PPSTACK_MASK_BAD;
                 numRejected++;
+            } else {
+                // Add to list of pixels already rejected
+                reject = psPixelsConcatenate(reject, options->rejected->data[i]);
+                options->rejected->data[i] = psPixelsDuplicates(options->rejected->data[i], reject);
             }
-        }
-
-        if (reject) {
-            // Add to list of pixels already rejected
-            reject = psPixelsConcatenate(reject, options->rejected->data[i]);
-            options->rejected->data[i] = psPixelsDuplicates(options->rejected->data[i], reject);
         }
 
@@ -170 +167 @@
 
     psFree(options->inspect); options->inspect = NULL;
-    psFree(options->kernels); options->kernels = NULL;
-    psFree(options->regions); options->regions = NULL;
 
     if (numRejected >= num) {