Changeset 25810 for branches/pap/ppStack/src/ppStackCombineFinal.c

Timestamp:

Oct 8, 2009, 9:19:14 AM (17 years ago)

Author:

Paul Price

Message:

Final combination has to go into a nominated readout.

File:

• branches/pap/ppStack/src/ppStackCombineFinal.c (modified) (3 diffs)

branches/pap/ppStack/src/ppStackCombineFinal.c

@@ -10 +10 @@
 #include "ppStackLoop.h"
 
-bool ppStackCombineFinal(ppStackThreadData *stack, ppStackOptions *options, pmConfig *config)
+bool ppStackCombineFinal(pmReadout *target, ppStackThreadData *stack,
+                         ppStackOptions *options, pmConfig *config)
 {
     psAssert(stack, "Require stack");
@@ -30 +31 @@
         }
 
-        // call: ppStackReadoutFinal(config, outRO, readouts, rejected)
+        // call: ppStackReadoutFinal(config, target, readouts, rejected)
         psThreadJob *job = psThreadJobAlloc("PPSTACK_FINAL_COMBINE"); // Job to start
+        psArrayAdd(job->args, 1, target);
         psArrayAdd(job->args, 1, thread);
         psArrayAdd(job->args, 1, options);
@@ -65 +67 @@
         }
         if (sumWeights > 0.0) {
-            pmReadout *outRO = options->outRO;  // Output readout
-            outRO->covariance = psImageCovarianceSum(options->covariances);
-            psBinaryOp(outRO->covariance->image, outRO->covariance->image, "/",
+            target->covariance = psImageCovarianceSum(options->covariances);
+            psBinaryOp(target->covariance->image, target->covariance->image, "/",
                        psScalarAlloc(sumWeights, PS_TYPE_F32));
             psFree(options->covariances); options->covariances = NULL;
-            psImageCovarianceTransfer(outRO->variance, outRO->covariance);
+            psImageCovarianceTransfer(target->variance, target->covariance);
         }
     } else {
-        options->outRO->covariance = psImageCovarianceNone();
+        target->covariance = psImageCovarianceNone();
     }
 
 #ifdef TESTING
-    pmStackVisualPlotTestImage(outRO->image, "combined_initial.fits");
-    ppStackWriteImage("combined_final.fits", NULL, outRO->image, config);
+    pmStackVisualPlotTestImage(target->image, "combined_initial.fits");
+    ppStackWriteImage("combined_final.fits", NULL, target->image, config);
 #endif