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

Timestamp:

Feb 22, 2008, 4:29:09 PM (18 years ago)

Author:

Paul Price

Message:

Updating to use new pmStackCombine API

File:

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

trunk/ppStack/src/ppStackReadout.c

@@ -31 +31 @@
 
     // Get the recipe values
+    bool mdok;                          // Status of MD lookup
     int iter = psMetadataLookupS32(NULL, config->arguments, "ITER"); // Rejection iterations
     float combineRej = psMetadataLookupF32(NULL, config->arguments, "COMBINE.REJ"); // Combination threshold
@@ -36 +37 @@
     psMaskType maskBlank = psMetadataLookupU8(NULL, config->arguments, "MASK.BLANK"); // Mask for blank reg.
     float threshold = psMetadataLookupF32(NULL, config->arguments, "THRESHOLD.MASK"); // Threshold for mask deconvolution
+    bool useVariance = psMetadataLookupBool(&mdok, config->arguments, "VARIANCE"); // Use variance for rejection?
+    bool safe = psMetadataLookupBool(&mdok, config->arguments, "SAFE"); // Play safe when combining small numbers of pixels?
 
     int num = readouts->n;              // Number of inputs
@@ -106 +109 @@
     }
 
-    if (!pmStackCombine(outRO, stack, maskBad, maskBlank, iter, combineRej)) {
+    if (!pmStackCombine(outRO, stack, maskBad, maskBlank, iter, combineRej, useVariance, safe)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts with rejection.");
         psFree(fpaList);
@@ -175 +178 @@
 #endif
 
-    if (!pmStackCombine(outRO, stack, maskBad, maskBlank, 0, combineRej)) {
+    if (!pmStackCombine(outRO, stack, maskBad, maskBlank, 0, combineRej, useVariance, safe)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts.");
         psFree(fpaList);