Changeset 25830

Timestamp:

Oct 13, 2009, 11:12:03 AM (17 years ago)

Author:

Paul Price

Message:

Need to normalise the inputs that aren't being convolved before combining.

Location:

branches/pap/ppStack/src

Files:

• ppStack.h (modified) (1 diff)
• ppStackCombineFinal.c (modified) (2 diffs)
• ppStackConvolve.c (modified) (1 diff)
• 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

@@ -84 +84 @@
                          const psVector *weightings, // Weighting factors for each image
                          const psVector *addVariance, // Additional variance for rejection
-                         bool full                    // Combine full image?
+                         bool full,                   // Combine full image?
+                         const psVector *norm         // Normalisations to apply
     );
 

branches/pap/ppStack/src/ppStackCombineFinal.c

@@ -11 +11 @@
 
 bool ppStackCombineFinal(pmReadout *target, ppStackThreadData *stack,
-                         ppStackOptions *options, pmConfig *config, bool full)
+                         ppStackOptions *options, pmConfig *config, bool full, 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, normalise, PS_TYPE_U8);
         if (!psThreadJobAddPending(job)) {
             psFree(job);

branches/pap/ppStack/src/ppStackConvolve.c

@@ -149 +149 @@
     psFree(rng);
 
-    psFree(options->norm); options->norm = NULL;
     psFree(options->sourceLists); options->sourceLists = NULL;
     psFree(options->psf); options->psf = NULL;

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, config, false)) {
+    if (!ppStackCombineFinal(options->outRO, stack, options, config, false, false)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to perform final combination.");
         psFree(stack);
@@ -132 +132 @@
         }
         psTrace("ppStack", 2, "Stack of unconvolved images....\n");
-        if (!ppStackCombineFinal(options->unconvRO, stack, options, config, true)) {
+        if (!ppStackCombineFinal(options->unconvRO, stack, options, config, true, true)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to perform unconvolved combination.");
             psFree(stack);

branches/pap/ppStack/src/ppStackLoop.h

@@ -60 +60 @@
     ppStackOptions *options,            // Options
     pmConfig *config,                   // Configuration
-    bool full                           // Combine full image?
+    bool full,                          // Combine full image?
+    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?
 
     psVector *mask = options->inputMask; // Mask for inputs
@@ -49 +50 @@
     psVector *weightings = options->weightings; // Weightings (1/noise^2) for each image
     psVector *addVariance = options->matchChi2; // Additional variance when rejecting
-
+    psVector *norm = normalise ? options->norm : NULL; // Normalisations to apply to images
 
     bool status = ppStackReadoutFinal(config, target, thread->readouts, mask, rejected,
-                                      weightings, addVariance, full); // Status of operation
+                                      weightings, addVariance, full, norm); // Status of operation
 
     thread->busy = false;
@@ -182 +183 @@
 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 *addVariance, bool full, const psVector *norm)
 {
     assert(config);
@@ -252 +253 @@
         data->reject = rejected ? psMemIncrRefCounter(rejected->data[i]) : NULL;
         stack->data[i] = data;
+
+        if (norm) {
+            float normalise = powf(10.0, -0.4 * norm->data.F32[i]); // Normalisation
+            psBinaryOp(ro->image, ro->image, "*", psScalarAlloc(normalise, PS_TYPE_F32));
+            psBinaryOp(ro->variance, ro->variance, "*", psScalarAlloc(PS_SQR(normalise), PS_TYPE_F32));
+        }
     }
 

branches/pap/ppStack/src/ppStackThread.c

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