Changeset 27319 for trunk/ppStack/src/ppStackReadout.c

Timestamp:

Mar 18, 2010, 12:01:15 PM (16 years ago)

Author:

Paul Price

Message:

Reworking ppStack to not grow the rejected pixels for the unconvolved stack. Also working with convolved and unconvolved stacks separately, so they don't have to be in memory at the same time. This should reduce the memory usage of ppStack.

File:

• trunk/ppStack/src/ppStackReadout.c (modified) (1 diff)

trunk/ppStack/src/ppStackReadout.c

@@ -39 +39 @@
     pmReadout *target = args->data[0];  // Output readout
     ppStackThread *thread = args->data[1]; // Thread
-    ppStackOptions *options = args->data[2]; // Options
-    pmConfig *config = args->data[3];   // Configuration
-    bool safety = PS_SCALAR_VALUE(args->data[4], U8);    // Safety switch on?
-    bool normalise = PS_SCALAR_VALUE(args->data[5], U8); // Normalise images?
+    psArray *reject = args->data[2];    // Rejected pixels for each image
+    ppStackOptions *options = args->data[3]; // Options
+    pmConfig *config = args->data[4];   // Configuration
+    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
-    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
     psVector *norm = normalise ? options->norm : NULL; // Normalisations to apply to images
 
-    bool status = ppStackReadoutFinal(config, target, thread->readouts, mask, rejected,
+    bool status = ppStackReadoutFinal(config, target, thread->readouts, mask, reject,
                                       weightings, addVariance, safety, norm); // Status of operation