Changeset 23352 for branches/cnb_branches/cnb_branch_20090301/ppStack/src/ppStackReadout.c

Timestamp:

Mar 17, 2009, 12:08:50 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppStack (modified) (1 prop)
• ppStack/src/ppStackReadout.c (modified) (4 diffs)

branches/cnb_branches/cnb_branch_20090301/ppStack/src/ppStackReadout.c

@@ -8 +8 @@
 #include <psphot.h>
 
+#include "ppStackThread.h"
 #include "ppStack.h"
 
@@ -16 +17 @@
     psArray *args = job->args;          // Arguments
     ppStackThread *thread = args->data[0]; // Thread
-    pmConfig *config = args->data[1];   // Configuration
-    pmReadout *outRO = args->data[2];   // Output readout
-    psVector *mask = args->data[3];     // Mask for inputs
-    psVector *weightings = args->data[4]; // Weightings (1/noise^2) for each image
-    psVector *addVariance = args->data[5]; // Additional variance when rejecting
+    ppStackOptions *options = args->data[1]; // Options
+    pmConfig *config = args->data[2];   // Configuration
+
+    pmReadout *outRO = options->outRO;  // Output readout
+    psVector *mask = options->inputMask; // Mask for inputs
+    psVector *weightings = options->weightings; // Weightings (1/noise^2) for each image
+    psVector *addVariance = options->matchChi2; // Additional variance when rejecting
 
     psArray *inspect = ppStackReadoutInitial(config, outRO, thread->readouts, mask,
@@ -37 +40 @@
     psArray *args = job->args;          // Arguments
     ppStackThread *thread = args->data[0]; // Thread
-    pmConfig *config = args->data[1];   // Configuration
-    pmReadout *outRO = args->data[2];   // Output readout
-    psVector *mask = args->data[3];     // Mask for inputs
-    psArray *rejected = args->data[4];  // Rejected pixels
-    psVector *weightings = args->data[5];  // Weighting (1/noise^2) for each image
-    psVector *addVariance = args->data[6];  // Weighting (1/noise^2) for each image
+    ppStackOptions *options = args->data[1]; // Options
+    pmConfig *config = args->data[2];   // Configuration
+
+    pmReadout *outRO = options->outRO;  // Output readout
+    psVector *mask = options->inputMask; // Mask for inputs
+    psArray *rejected = options->rejected; // Rejected pixels
+    psVector *weightings = options->weightings; // Weightings (1/noise^2) for each image
+    psVector *addVariance = options->matchChi2; // Additional variance when rejecting
 
     bool status = ppStackReadoutFinal(config, outRO, thread->readouts, mask, rejected,
@@ -227 +232 @@
         }
 
-        pmStackData *data = pmStackDataAlloc(ro, weightings->data.F32[i], addVariance->data.F32[i]);
+        pmStackData *data = pmStackDataAlloc(ro, weightings->data.F32[i],
+                                             addVariance ? addVariance->data.F32[i] : NAN);
         data->reject = psMemIncrRefCounter(rejected->data[i]);
         stack->data[i] = data;