Changeset 25911

Timestamp:

Oct 21, 2009, 1:03:45 PM (17 years ago)

Author:

Paul Price

Message:

Adding unconvolved mask and variance as outputs in addition to the unconvolved image.

Location:

branches/pap/ppStack/src

Files:

• ppStackCamera.c (modified) (1 diff)
• ppStackCombineFinal.c (modified) (3 diffs)
• ppStackConvolve.c (modified) (3 diffs)
• ppStackLoop.c (modified) (2 diffs)
• ppStackLoop.h (modified) (1 diff)
• ppStackOptions.c (modified) (4 diffs)
• ppStackOptions.h (modified) (2 diffs)
• ppStackThread.c (modified) (1 diff)

branches/pap/ppStack/src/ppStackCamera.c

@@ -316 +316 @@
         psError(PS_ERR_UNKNOWN, false, "Unable to generate output FPA.");
         return false;
+    }
+
+    // Unconvolved mask
+    pmFPAfile *unconvMask = pmFPAfileDefineOutput(config, unconvFPA, "PPSTACK.UNCONV.MASK");
+    if (!unconvMask) {
+        psError(PS_ERR_IO, false, _("Unable to generate output file from PPSTACK.UNCONV.MASK"));
+        return false;
+    }
+    if (unconvMask->type != PM_FPA_FILE_MASK) {
+        psError(PS_ERR_IO, true, "PPSTACK.UNCONV.MASK is not of type MASK");
+        return false;
+    }
+    unconvMask->save = true;
+
+    // Unconvolved variance
+    if (haveVariances) {
+        pmFPAfile *unconvVariance = pmFPAfileDefineOutput(config, unconvFPA, "PPSTACK.UNCONV.VARIANCE");
+        if (!unconvVariance) {
+            psError(PS_ERR_IO, false, _("Unable to generate output file from PPSTACK.UNCONV.VARIANCE"));
+            return false;
+        }
+        if (unconvVariance->type != PM_FPA_FILE_VARIANCE) {
+            psError(PS_ERR_IO, true, "PPSTACK.UNCONV.VARIANCE is not of type VARIANCE");
+            return false;
+        }
+        unconvVariance->save = true;
     }
 #endif

branches/pap/ppStack/src/ppStackCombineFinal.c

@@ -10 +10 @@
 #include "ppStackLoop.h"
 
-bool ppStackCombineFinal(pmReadout *target, ppStackThreadData *stack,
+bool ppStackCombineFinal(pmReadout *target, ppStackThreadData *stack, psArray *covariances,
                          ppStackOptions *options, pmConfig *config, bool full, bool normalise)
 {
@@ -56 +56 @@
 
     // Sum covariance matrices
-    if (options->covariances) {
+    if (covariances) {
         double sumWeights = 0.0;            // Sum of weights
         for (int i = 0; i < options->num; i++) {
             if (options->inputMask->data.U8[i]) {
-                psFree(options->covariances->data[i]);
-                options->covariances->data[i] = NULL;
+                psFree(covariances->data[i]);
+                covariances->data[i] = NULL;
                 continue;
             }
-            psKernel *covar = options->covariances->data[i]; // Covariance matrix
+            psKernel *covar = covariances->data[i]; // Covariance matrix
             if (!covar) {
                 continue;
@@ -73 +73 @@
         }
         if (sumWeights > 0.0) {
-            target->covariance = psImageCovarianceSum(options->covariances);
+            target->covariance = psImageCovarianceSum(covariances);
             psBinaryOp(target->covariance->image, target->covariance->image, "/",
                        psScalarAlloc(sumWeights, PS_TYPE_F32));
-            psFree(options->covariances); options->covariances = NULL;
             psImageCovarianceTransfer(target->variance, target->covariance);
         }

branches/pap/ppStack/src/ppStackConvolve.c

@@ -39 +39 @@
     options->weightings = psVectorAlloc(num, PS_TYPE_F32); // Combination weightings for images (1/noise^2)
     psVectorInit(options->weightings, 0.0);
-    options->covariances = psArrayAlloc(num); // Covariance matrices
+    options->origCovars = psArrayAlloc(num);
+    options->convCovars = psArrayAlloc(num); // Covariance matrices
 
     psList *fpaList = psListAlloc(NULL); // List of input FPAs, for concept averaging
@@ -79 +80 @@
         // Background subtraction, scaling and normalisation is performed automatically by the image matching
         psTimerStart("PPSTACK_MATCH");
+        options->origCovars->data[i] = psMemIncrRefCounter(readout->covariance);
         if (!ppStackMatch(readout, options, i, config)) {
             psErrorStackPrint(stderr, "Unable to match image %d --- ignoring.", i);
@@ -85 +87 @@
             continue;
         }
-        options->covariances->data[i] = psMemIncrRefCounter(readout->covariance);
+        options->convCovars->data[i] = psMemIncrRefCounter(readout->covariance);
 
         if (options->stats) {

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, false)) {
+    if (!ppStackCombineFinal(options->outRO, stack, options->convCovars, 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, true)) {
+        if (!ppStackCombineFinal(options->unconvRO, stack, options->origCovars, options, config, true, true)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to perform unconvolved combination.");
             psFree(stack);

branches/pap/ppStack/src/ppStackLoop.h

@@ -58 +58 @@
     pmReadout *target,                  // Target readout
     ppStackThreadData *stack,           // Stack
+    psArray *covariances,               // Covariances
     ppStackOptions *options,            // Options
     pmConfig *config,                   // Configuration

branches/pap/ppStack/src/ppStackOptions.c

@@ -15 +15 @@
     psFree(options->origMasks);
     psFree(options->origVariances);
+    psFree(options->origCovars);
     psFree(options->convImages);
     psFree(options->convMasks);
@@ -27 +28 @@
     psFree(options->matchChi2);
     psFree(options->weightings);
-    psFree(options->covariances);
+    psFree(options->convCovars);
     psFree(options->outRO);
     psFree(options->unconvRO);
@@ -46 +47 @@
     options->origMasks = NULL;
     options->origVariances = NULL;
+    options->origCovars = NULL;
     options->convImages = NULL;
     options->convMasks = NULL;
@@ -61 +63 @@
     options->matchChi2 = NULL;
     options->weightings = NULL;
-    options->covariances = NULL;
+    options->convCovars = NULL;
     options->outRO = NULL;
     options->unconvRO = NULL;

branches/pap/ppStack/src/ppStackOptions.h

@@ -13 +13 @@
     psArray *origImages, *origMasks, *origVariances; // Filenames of the original images
     psArray *convImages, *convMasks, *convVariances; // Filenames for the temporary convolved images
+    psArray *origCovars;                // Original covariances matrices
     int num;                            // Number of inputs
     // Prepare
@@ -27 +28 @@
     psVector *matchChi2;                // chi^2 for stamps from matching
     psVector *weightings;               // Combination weightings for images (1/noise^2)
-    psArray *covariances;                 // Convolved covariance matrices
+    psArray *convCovars;                // Convolved covariance matrices
     // Combine initial
     pmReadout *outRO;                   // Output readout

branches/pap/ppStack/src/ppStackThread.c

@@ -64 +64 @@
     const psArray *imageNames = conv ? options->convImages : options->origImages; // Names of images to read
     const psArray *maskNames = conv ? options->convMasks : options->origMasks; // Names of masks to read
-    const psArray *varianceNames = conv ? options->convVariances : NULL; // Variance names
-    const psArray *covariances = conv ? options->covariances : NULL; // Covariance matrices
+    const psArray *varianceNames = conv ? options->convVariances : options->origVariances; // Variance names
+    const psArray *covariances = conv ? options->convCovars : options->origCovars; // Covariance matrices
 
     PS_ASSERT_ARRAY_NON_NULL(cells, NULL);