Changeset 27517 for branches/eam_branches/20100225/ppStack/src/ppStackReject.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackReject.c (modified) (5 diffs)

branches/eam_branches/20100225/ppStack/src/ppStackReject.c

@@ -10 +10 @@
 #include "ppStackLoop.h"
 
-//#define TESTING
+// #define TESTING
 
 bool ppStackReject(ppStackOptions *options, pmConfig *config)
@@ -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);
         }
 
@@ -168 +165 @@
 
     psFree(options->inspect); options->inspect = NULL;
-    psFree(options->kernels); options->kernels = NULL;
-    psFree(options->regions); options->regions = NULL;
 
     if (numRejected >= num) {