Changeset 25968

Timestamp:

Oct 29, 2009, 10:55:24 AM (17 years ago)

Author:

Paul Price

Message:

ppStackReadoutFinal should always do full rejection.

File:

• branches/pap/ppStack/src/ppStackReadout.c (modified) (3 diffs)

branches/pap/ppStack/src/ppStackReadout.c

@@ -214 +214 @@
 
     bool mdok;                          // Status of MD lookup
-    int iter = psMetadataLookupS32(NULL, recipe, "ITER"); // Rejection iterations
-    float combineRej = psMetadataLookupF32(NULL, recipe, "COMBINE.REJ"); // Combination threshold
-    float combineSys = psMetadataLookupF32(NULL, recipe, "COMBINE.SYS"); // Combination systematic error
-    float combineDiscard = psMetadataLookupF32(NULL, recipe, "COMBINE.DISCARD"); // Olympic discard fraction
     bool useVariance = psMetadataLookupBool(&mdok, recipe, "VARIANCE"); // Use variance for rejection?
     bool safe = psMetadataLookupBool(&mdok, recipe, "SAFE"); // Be safe when combining small numbers of pixels
@@ -229 +225 @@
     psArray *stack = psArrayAlloc(num); // Array for stacking
 
-    if (rejected) {
-        // We have rejection from a previous combination: combine without flagging pixels to inspect
-        safe &= safety;
-        iter = 0;
-        combineRej = NAN;
-        combineSys = NAN;
-    }
+    // We have rejection from a previous combination: combine without flagging pixels to inspect
+    safe &= safety;
+    int iter = 0;
+    float combineRej = NAN;
+    float combineSys = NAN;
+    float combineDiscard = NAN;
 
     for (int i = 0; i < num; i++) {
@@ -273 +268 @@
 
     if (!pmStackCombine(outRO, stack, maskVal | maskBad, maskBad, 0, iter, combineRej,
-                        combineSys, combineDiscard, useVariance, safe, !rejected)) {
+                        combineSys, combineDiscard, useVariance, safe, true)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts.");
         psFree(stack);