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

Timestamp:

Mar 22, 2010, 8:34:28 PM (16 years ago)

Author:

Paul Price

Message:

Adding exposure map (both exposure time and number of inputs) to the outputs of ppStack. These are calculated both for the regular (convolved) and unconvolved stacks. These should compress pretty well, but I haven't enabled the compression yet. I also plan to add a weighted exposure time output.

File:

• trunk/ppStack/src/ppStackReadout.c (modified) (8 diffs)

trunk/ppStack/src/ppStackReadout.c

@@ -23 +23 @@
     psVector *mask = options->inputMask; // Mask for inputs
     psVector *weightings = options->weightings; // Weightings (1/noise^2) for each image
+    psVector *exposures = options->exposures;   // Exposure times for each image
     psVector *addVariance = options->matchChi2; // Additional variance when rejecting
 
     job->results = ppStackReadoutInitial(config, outRO, thread->readouts, mask,
-                                         weightings, addVariance);
+                                         weightings, exposures, addVariance);
     thread->busy = false;
 
@@ -37 +38 @@
 
     psArray *args = job->args;          // Arguments
-    pmReadout *target = args->data[0];  // Output readout
-    ppStackThread *thread = args->data[1]; // Thread
-    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?
+    ppStackThread *thread = args->data[0]; // Thread
+    psArray *reject = args->data[1];    // Rejected pixels for each image
+    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?
 
     psVector *mask = options->inputMask; // Mask for inputs
     psVector *weightings = options->weightings; // Weightings (1/noise^2) for each image
+    psVector *exposures = options->exposures;   // Exposure times 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, reject,
-                                      weightings, addVariance, safety, norm); // Status of operation
+    bool status = ppStackReadoutFinal(config, options->outRO, options->expRO, thread->readouts, mask, reject,
+                                      weightings, exposures, addVariance, safety, norm); // Status of operation
 
     thread->busy = false;
+
+    psAssert(status, "Stacking failed.");
 
     return status;
@@ -101 +104 @@
 
 psArray *ppStackReadoutInitial(const pmConfig *config, pmReadout *outRO, const psArray *readouts,
-                               const psVector *mask, const psVector *weightings, const psVector *addVariance)
+                               const psVector *mask, const psVector *weightings, const psVector *exposures,
+                               const psVector *addVariance)
 {
     assert(config);
@@ -149 +153 @@
         }
 
-        stack->data[i] = pmStackDataAlloc(ro, weightings->data.F32[i], addVariance->data.F32[i]);
-    }
-
-    if (!pmStackCombine(outRO, stack, maskVal | maskBad, maskSuspect, maskBad, kernelSize, iter,
+        stack->data[i] = pmStackDataAlloc(ro, weightings->data.F32[i], exposures->data.F32[i],
+                                          addVariance->data.F32[i]);
+    }
+
+    if (!pmStackCombine(outRO, NULL, stack, maskVal | maskBad, maskSuspect, maskBad, kernelSize, iter,
                         combineRej, combineSys, combineDiscard, useVariance, safe, false)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts with rejection.");
@@ -187 +192 @@
 
 
-bool ppStackReadoutFinal(const pmConfig *config, pmReadout *outRO, const psArray *readouts,
+bool ppStackReadoutFinal(const pmConfig *config, pmReadout *outRO, pmReadout *expRO, const psArray *readouts,
                          const psVector *mask, const psArray *rejected, const psVector *weightings,
-                         const psVector *addVariance, bool safety, const psVector *norm)
+                         const psVector *exposures, const psVector *addVariance, bool safety,
+                         const psVector *norm)
 {
     assert(config);
     assert(outRO);
+    assert(expRO);
     assert(readouts);
     assert(!rejected || readouts->n == rejected->n);
@@ -238 +245 @@
         }
 
-        pmStackData *data = pmStackDataAlloc(ro, weightings->data.F32[i],
+        pmStackData *data = pmStackDataAlloc(ro, weightings->data.F32[i], exposures->data.F32[i],
                                              addVariance ? addVariance->data.F32[i] : NAN);
         data->reject = rejected ? psMemIncrRefCounter(rejected->data[i]) : NULL;
@@ -250 +257 @@
     }
 
-    if (!pmStackCombine(outRO, stack, maskVal | maskBad, maskSuspect, maskBad, 0, iter, combineRej,
+    if (!pmStackCombine(outRO, expRO, stack, maskVal | maskBad, maskSuspect, maskBad, 0, iter, combineRej,
                         combineSys, combineDiscard, useVariance, safe, rejected)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts.");
@@ -259 +266 @@
     pmCell *outCell = outRO->parent;    // Output cell
     pmChip *outChip = outCell->parent;  // Output chip
-
     outRO->data_exists = true;
     outCell->data_exists = true;
     outChip->data_exists = true;
 
+    pmCell *expCell = expRO->parent;    // Exposure cell
+    pmChip *expChip = expCell->parent;  // Exposure chip
+    expRO->data_exists = true;
+    expCell->data_exists = true;
+    expChip->data_exists = true;
+
     psFree(stack);