Changeset 26629

Timestamp:

Jan 19, 2010, 2:30:36 PM (16 years ago)

Author:

Paul Price

Message:

Recipe value GAIN.OVERRIDE specifies whether the gain should be set to unity in the event it is non-finite in ppImage and ppMerge. This seems to be a problem for GPC1, where some gains are not set because they haven't been measured. GAIN.OVERRIDE is turned on for ppImage on GPC1, and off for everything else.

Location:

trunk

Files:

• ippconfig/gpc1/ppImage.config (modified) (1 diff)
• ippconfig/recipes/ppImage.config (modified) (1 diff)
• ippconfig/recipes/ppMerge.config (modified) (1 diff)
• ppImage/src/ppImageDetrendReadout.c (modified) (1 diff)
• ppMerge/src/ppMergeScaleZero.c (modified) (5 diffs)

trunk/ippconfig/gpc1/ppImage.config

@@ -14 +14 @@
 
 OLDDARK                 BOOL    FALSE
+
+GAIN.OVERRIDE           BOOL    TRUE            # Override a non-finite gain?
 
 # use the deburned image instead of the raw, if it exists

trunk/ippconfig/recipes/ppImage.config

@@ -128 +128 @@
 FRINGE.FILTERS  MULTI
 FRINGE.FILTERS  STR UNDEF
+
+GAIN.OVERRIDE   BOOL    FALSE           # Override a non-finite gain?
 
 DETREND.CONSTRAINTS  METADATA

trunk/ippconfig/recipes/ppMerge.config

@@ -43 +43 @@
 STATS.BY.CHIP       BOOL    TRUE            # measure stats for masking by chip (or by readout)
 MASK.GROW.NPIX      S32     3               # measure stats for masking by chip (or by readout)
+
+GAIN.OVERRIDE       BOOL    FALSE           # Override non-finite gain?
 
 # Ordinates for fitting dark current

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -89 +89 @@
             psFree (binning);
         }
+
+        // Check that the gain is set
+        float gain = psMetadataLookupF32(NULL, input->parent->concepts, "CELL.GAIN"); // Gain for cell
+        if (!isfinite(gain)) {
+            psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, RECIPE_NAME); // Recipe
+            psAssert(recipe, "Should be there!");
+            bool override = psMetadataLookupBool(NULL, recipe, "GAIN.OVERRIDE"); // Override the bad gain?
+            if (override) {
+                psWarning("CELL.GAIN is not set for readout (%d,%d,%d) --- setting to unity.",
+                          view->chip, view->cell, view->readout);
+                psMetadataItem *item = psMetadataLookup(input->parent->concepts, "CELL.GAIN"); // Gain item
+                psAssert(item, "Should be there!");
+                item->data.F32 = 1.0;
+            } else {
+                psError(PS_ERR_BAD_PARAMETER_VALUE, false, "CELL.GAIN is not set for readout (%d,%d,%d)",
+                        view->chip, view->cell, view->readout);
+                return false;
+            }
+        }
+
         pmReadoutGenerateVariance(input, noiseImage, true);
         psFree (noiseImage);

trunk/ppMerge/src/ppMergeScaleZero.c

@@ -67 +67 @@
         pmChip *chip;                   ///< Chip of interest
         while ((chip = pmFPAviewNextChip(view, fpa, 1))) {
-            if (!chip->process || !chip->file_exists) {
-                continue;
-            }
+            if (!chip->process || !chip->file_exists) {
+                continue;
+            }
             if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
                 goto ERROR;
@@ -76 +76 @@
             pmCell *cell;               ///< Cell of interest
             while ((cell = pmFPAviewNextCell(view, fpa, 1))) {
-                if (!cell->process || !cell->file_exists) {
-                    continue;
-                }
+                if (!cell->process || !cell->file_exists) {
+                    continue;
+                }
                 if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
                     goto ERROR;
@@ -87 +87 @@
                 }
 
-                // skip cells with video data
+                // skip cells with video data
                 if (cell->readouts->n > 1) {
-                    // psError(PS_ERR_BAD_PARAMETER_VALUE, true, "File %d chip %d cell %d contains more than one readout (%ld)", i, view->chip, view->cell, cell->readouts->n);
-                    // goto ERROR;
-                  psWarning("File %d chip %d cell %d contains more than one readout (%ld), skipping", i, view->chip, view->cell, cell->readouts->n);
-                  continue;
+                    // psError(PS_ERR_BAD_PARAMETER_VALUE, true, "File %d chip %d cell %d contains more than one readout (%ld)", i, view->chip, view->cell, cell->readouts->n);
+                    // goto ERROR;
+                  psWarning("File %d chip %d cell %d contains more than one readout (%ld), skipping",
+                            i, view->chip, view->cell, cell->readouts->n);
+                  continue;
                 }
                 pmReadout *readout = cell->readouts->data[0]; ///< Readout of interest
@@ -104 +105 @@
                       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);
+                          psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes,
+                                                                        PPMERGE_RECIPE); // Recipe
+                          psAssert(recipe, "Should be there!");
+                          bool override = psMetadataLookupBool(NULL, recipe,
+                                                               "GAIN.OVERRIDE"); // Override the bad gain?
+                          if (override) {
+                              psWarning("CELL.GAIN is not set for readout (%d,%d,%d) on file %d "
+                                        "--- setting to unity.",
+                                        view->chip, view->cell, view->readout, i);
+                              psMetadataItem *item = psMetadataLookup(cell->concepts,
+                                                                      "CELL.GAIN"); // Item with gain
+                              psAssert(item, "Should be there!");
+                              item->data.F32 = 1.0;
+                          } else {
+                              // 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;
@@ -118 +135 @@
                         // i, view->chip, view->cell);
                         // goto ERROR;
-                        psWarning ("Unable to get statistics for file %d chip %d cell %d", i, view->chip, view->cell);
+                        psWarning ("Unable to get statistics for file %d chip %d cell %d",
+                                   i, view->chip, view->cell);
                         background->data.F32[i][cellNum] = NAN;
                       } else {