Changeset 9341 for trunk/ppMerge/src/ppMergeCombine.c

Timestamp:

Oct 5, 2006, 5:36:22 PM (20 years ago)

Author:

Paul Price

Message:

Enabling iteration on shutter measurement.

File:

• trunk/ppMerge/src/ppMergeCombine.c (modified) (2 diffs)

trunk/ppMerge/src/ppMergeCombine.c

@@ -131 +131 @@
                 psVectorInit(exptimes, 0);
                 psArray *images = psArrayAlloc(filenames->n); // Array of images
+                psArray *weights = psArrayAlloc(filenames->n); // Array of weights
                 psArray *masks = psArrayAlloc(filenames->n); // Array of masks
-                images->n = masks->n = filenames->n;
+                images->n = masks->n = weights->n = filenames->n;
                 for (int i = 0; i < filenames->n; i++) {
                     if (! filenames->data[i] || strlen(filenames->data[i]) == 0) {
@@ -163 +164 @@
                     pmReadout *readoutIn = cellIn->readouts->data[0];
                     images->data[i] = psMemIncrRefCounter(readoutIn->image);
+                    weights->data[i] = psMemIncrRefCounter(readoutIn->weight);
                     masks->data[i] = psMemIncrRefCounter(readoutIn->mask);
                     numRead++;
                 }
                 if (numRead > 1) {
-                    readout->image = pmShutterCorrectionMeasure(exptimes, images, masks,
+                    readout->image = pmShutterCorrectionMeasure(exptimes, images, weights, masks,
                                                                 options->shutterSize, options->mean,
-                                                                options->stdev, options->combine->maskVal);
+                                                                options->stdev, options->shutterIter,
+                                                                options->shutterRej,
+                                                                options->combine->maskVal);
                     psTrace(__func__, 5, "Chip %d, cell %d\n", view->chip, view->cell);
                 } else {