Changeset 25812 for branches/pap/ppStack/src/ppStackReadout.c

Timestamp:

Oct 8, 2009, 10:56:29 AM (17 years ago)

Author:

Paul Price

Message:

Need to be able to choose whether to combine entire image or not.

File:

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

branches/pap/ppStack/src/ppStackReadout.c

@@ -43 +43 @@
     ppStackOptions *options = args->data[2]; // Options
     pmConfig *config = args->data[3];   // Configuration
+    bool full = PS_SCALAR_VALUE(args->data[4], U8); // Combine full image?
 
     psVector *mask = options->inputMask; // Mask for inputs
@@ -49 +50 @@
     psVector *addVariance = options->matchChi2; // Additional variance when rejecting
 
+
     bool status = ppStackReadoutFinal(config, target, thread->readouts, mask, rejected,
-                                      weightings, addVariance); // Status of operation
+                                      weightings, addVariance, full); // Status of operation
 
     thread->busy = false;
@@ -180 +182 @@
 bool ppStackReadoutFinal(const pmConfig *config, pmReadout *outRO, const psArray *readouts,
                          const psVector *mask, const psArray *rejected, const psVector *weightings,
-                         const psVector *addVariance)
+                         const psVector *addVariance, bool full)
 {
     assert(config);
@@ -211 +213 @@
     psArray *stack = psArrayAlloc(num); // Array for stacking
 
-    bool entire = true;                 // Combine entire image?
-    if (rejected) {
+    if (!rejected) {
         // We have rejection from a previous combination: combine without flagging pixels to inspect
-        entire = false;
         safe = false;
         iter = 0;
@@ -225 +225 @@
         if (mask->data.U8[i] & (PPSTACK_MASK_REJECT | PPSTACK_MASK_BAD)) {
             // Image completely rejected since previous combination
-            entire = true;
+            full = true;
             continue;
         } else if (mask->data.U8[i]) {
@@ -256 +256 @@
     if (!pmStackCombine(outRO, stack, maskVal | maskBad, maskBad, 0,
                         iter, combineRej, combineSys, combineDiscard,
-                        entire, useVariance, safe, !rejected)) {
+                        full, useVariance, safe, !rejected)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts.");
         psFree(stack);