Changeset 18930 for trunk/ppMerge/src/ppMergeScaleZero.c

Timestamp:

Aug 5, 2008, 4:08:29 PM (18 years ago)

Author:

Paul Price

Message:

Mask value isn't available until images have been read in.

File:

• trunk/ppMerge/src/ppMergeScaleZero.c (modified) (4 diffs)

trunk/ppMerge/src/ppMergeScaleZero.c

@@ -12 +12 @@
     psStatsOptions stdevStat = psMetadataLookupS32(NULL, config->arguments, "STDEV"); // Statistic for stdev
     int shutterSize = psMetadataLookupS32(NULL, config->arguments, "SHUTTER.SIZE"); // Size of shutter region
-
-    psMaskType maskVal = pmConfigMaskGet("MASK.VALUE", config); // Value to mask
 
     psVector *gains = NULL;             // Gains for each cell
@@ -82 +80 @@
                 pmReadout *readout = cell->readouts->data[0]; // Readout of interest
 
+                psMaskType maskVal = pmConfigMaskGet("MASK.VALUE", config); // Value to mask
+
                 switch (type) {
                   case PPMERGE_TYPE_FLAT:
@@ -88 +88 @@
                       float gain = psMetadataLookupF32(NULL, cell->concepts, "CELL.GAIN"); // Cell gain
                       if (!isfinite(gain)) {
-                        // psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                        // "CELL.GAIN for file %d chip %d cell %d is not set.",
-                        // i, view->chip, view->cell);
-                        // goto ERROR;
-                        psWarning ("CELL.GAIN for file %d chip %d cell %d is NaN", i, view->chip, view->cell);
+                        // psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                        // "CELL.GAIN for file %d chip %d cell %d is not set.",
+                        // i, view->chip, view->cell);
+                        // goto ERROR;
+                        psWarning ("CELL.GAIN for file %d chip %d cell %d is NaN", i, view->chip, view->cell);
                       }
                       gains->data.F32[cellNum] = gain;
@@ -98 +98 @@
                       // Measure the background
                       if (!psImageBackground(stats, NULL, readout->image, readout->mask, maskVal, rng)) {
-                        // psError(PS_ERR_UNKNOWN, false,
-                        // "Unable to get statistics for file %d chip %d cell %d",
-                        // i, view->chip, view->cell);
-                        // goto ERROR;
-                        psWarning ("Unable to get statistics for file %d chip %d cell %d", i, view->chip, view->cell);
-                        background->data.F32[i][cellNum] = NAN;
+                        // psError(PS_ERR_UNKNOWN, false,
+                        // "Unable to get statistics for file %d chip %d cell %d",
+                        // i, view->chip, view->cell);
+                        // goto ERROR;
+                        psWarning ("Unable to get statistics for file %d chip %d cell %d", i, view->chip, view->cell);
+                        background->data.F32[i][cellNum] = NAN;
                       } else {
-                        background->data.F32[i][cellNum] = psStatsGetValue(stats, meanStat);
-                      }
+                        background->data.F32[i][cellNum] = psStatsGetValue(stats, meanStat);
+                      }
                       break;
                   }