Changeset 9341

Timestamp:

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

Author:

Paul Price

Message:

Enabling iteration on shutter measurement.

Location:

trunk/ppMerge/src

Files:

• ppMergeCombine.c (modified) (2 diffs)
• ppMergeOptions.c (modified) (2 diffs)
• ppMergeOptions.h (modified) (1 diff)

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 {

trunk/ppMerge/src/ppMergeOptions.c

@@ -40 +40 @@
     options->stdev = PS_STAT_SAMPLE_STDEV;
     options->shutterSize = 10;
+    options->shutterIter = 2;
+    options->shutterRej = 3.0;
     options->onOff = 0;
     options->combine = pmCombineParamsAlloc(PS_STAT_SAMPLE_MEAN);
@@ -129 +131 @@
     OPTION_PARSE(options->combine->nKeep,    recipe, "NKEEP",     S32 );
     OPTION_PARSE(options->combine->maskVal,  recipe, "MASKVAL",   S32 );
-    OPTION_PARSE(options->shutterSize,       recipe, "SHUTTERSIZE", S32 );
+    OPTION_PARSE(options->shutterSize,       recipe, "SHUTTER.SIZE", S32 );
+    OPTION_PARSE(options->shutterIter,       recipe, "SHUTTER.ITER", S32 );
+    OPTION_PARSE(options->shutterRej,        recipe, "SHUTTER.REJECT", S32 );
+
     options->combine->combine = parseStat(recipe, "COMBINE");
     options->mean             = parseStat(recipe, "MEAN");

trunk/ppMerge/src/ppMergeOptions.h

@@ -27 +27 @@
     psStatsOptions stdev;               // Statistic to use to measure the stdev
     int shutterSize;                    // Size for shutter measurement regions
+    int shutterIter;                    // Number of iterations for shutter measurement
+    float shutterRej;                   // Rejection limit for shutter measurement
     ppOnOff onOff;                      // On/off pairs?
     pmCombineParams *combine;           // Combination parameters