Changeset 25924

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.

Location:

branches/pap/ppStack/src

Files:

• ppStack.h (modified) (1 diff)
• ppStackCombineFinal.c (modified) (2 diffs)
• ppStackLoop.c (modified) (2 diffs)
• ppStackLoop.h (modified) (1 diff)
• ppStackReadout.c (modified) (4 diffs)
• ppStackThread.c (modified) (1 diff)

branches/pap/ppStack/src/ppStack.h

@@ -85 +85 @@
                          const psVector *addVariance, // Additional variance for rejection
                          bool full,                   // Combine full image?
+                         bool safety,                 // Enable safety switch?
                          const psVector *norm         // Normalisations to apply
     );

branches/pap/ppStack/src/ppStackCombineFinal.c

@@ -11 +11 @@
 
 bool ppStackCombineFinal(pmReadout *target, ppStackThreadData *stack, psArray *covariances,
-                         ppStackOptions *options, pmConfig *config, bool full, bool normalise)
+                         ppStackOptions *options, pmConfig *config, bool full, bool safe, bool normalise)
 {
     psAssert(stack, "Require stack");
@@ -42 +42 @@
         psArrayAdd(job->args, 1, config);
         PS_ARRAY_ADD_SCALAR(job->args, full, PS_TYPE_U8);
+        PS_ARRAY_ADD_SCALAR(job->args, safe, PS_TYPE_U8);
         PS_ARRAY_ADD_SCALAR(job->args, normalise, PS_TYPE_U8);
         if (!psThreadJobAddPending(job)) {

branches/pap/ppStack/src/ppStackLoop.c

@@ -97 +97 @@
     // Final combination
     psTrace("ppStack", 2, "Final stack of convolved images....\n");
-    if (!ppStackCombineFinal(options->outRO, stack, options->convCovars, options, config, false, false)) {
+    if (!ppStackCombineFinal(options->outRO, stack, options->convCovars, options, config,
+                             false, false, false)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to perform final combination.");
         psFree(stack);
@@ -132 +133 @@
         }
         psTrace("ppStack", 2, "Stack of unconvolved images....\n");
-        if (!ppStackCombineFinal(options->unconvRO, stack, options->origCovars, options, config, true, true)) {
+        if (!ppStackCombineFinal(options->unconvRO, stack, options->origCovars, options, config,
+                                 true, true, true)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to perform unconvolved combination.");
             psFree(stack);

branches/pap/ppStack/src/ppStackLoop.h

@@ -62 +62 @@
     pmConfig *config,                   // Configuration
     bool full,                          // Combine full image?
+    bool safe,                          // Allow safe combination?
     bool norm                           // Normalise images?
     );

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;

branches/pap/ppStack/src/ppStackThread.c

@@ -282 +282 @@
 
     {
-        psThreadTask *task = psThreadTaskAlloc("PPSTACK_FINAL_COMBINE", 6);
+        psThreadTask *task = psThreadTaskAlloc("PPSTACK_FINAL_COMBINE", 7);
         task->function = &ppStackReadoutFinalThread;
         psThreadTaskAdd(task);