Changeset 26644

Timestamp:

Jan 20, 2010, 2:21:07 PM (16 years ago)

Author:

eugene

Message:

moved the GAIN check to come before the call to pmReadoutGenerateMask

File:

• trunk/ppImage/src/ppImageDetrendReadout.c (modified) (2 diffs)

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -14 +14 @@
     // find the currently selected readout
     pmReadout *input = pmFPAfileThisReadout(config->files, view, "PPIMAGE.INPUT");
+
+    // Check that the gain is set (this is used by both pmReadoutGenerateMask and pmReadoutGenerateVariance)
+    { 
+      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 {
+          psWarning("CELL.GAIN is NAN for readout (%d,%d,%d), image will be masked.", view->chip, view->cell, view->readout);
+        }
+      }
+    }
 
     // Masking on the basis of pixel value needs to be done before anything else, so the values are pristine.
@@ -90 +108 @@
         }
 
-        // 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);