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

Timestamp:

Oct 22, 2009, 2:19:10 PM (17 years ago)

Author:

Paul Price

Message:

Unconvolved images shouldn't be combined without the SAFE setting unless the user desires it.

File:

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

branches/pap/ppStack/src/ppStackReadout.c

@@ -44 +44 @@
     pmConfig *config = args->data[3];   // Configuration
     bool full = PS_SCALAR_VALUE(args->data[4], U8); // Combine full image?
-    bool normalise = PS_SCALAR_VALUE(args->data[5], U8); // Normalise images?
+    bool safety = PS_SCALAR_VALUE(args->data[5], U8);    // Safety switch on?
+    bool normalise = PS_SCALAR_VALUE(args->data[6], U8); // Normalise images?
 
     psVector *mask = options->inputMask; // Mask for inputs
@@ -53 +54 @@
 
     bool status = ppStackReadoutFinal(config, target, thread->readouts, mask, rejected,
-                                      weightings, addVariance, full, norm); // Status of operation
+                                      weightings, addVariance, full, safety, norm); // Status of operation
 
     thread->busy = false;
@@ -183 +184 @@
 bool ppStackReadoutFinal(const pmConfig *config, pmReadout *outRO, const psArray *readouts,
                          const psVector *mask, const psArray *rejected, const psVector *weightings,
-                         const psVector *addVariance, bool full, const psVector *norm)
+                         const psVector *addVariance, bool full, bool safety, const psVector *norm)
 {
     assert(config);
@@ -216 +217 @@
     if (rejected) {
         // We have rejection from a previous combination: combine without flagging pixels to inspect
-        safe = false;
+        safe &= safety;
         iter = 0;
         combineRej = NAN;