Changeset 26876

Timestamp:

Feb 10, 2010, 4:18:31 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/20091201/ppImage/src

Files:

• ppImageDefineFile.c (modified) (2 diffs)
• ppImageDetrendReadout.c (modified) (2 diffs)

branches/eam_branches/20091201/ppImage/src/ppImageDefineFile.c

@@ -12 +12 @@
 
     if (!file) {
-        // look for the file on the RUN metadata
-        file = pmFPAfileDefineFromRun(&status, NULL, config, filerule);
+        // look for the file on the argument list
+        file = pmFPAfileDefineFromArgs(&status, config, filerule, argname);
         if (!status) {
             psError(PS_ERR_UNKNOWN, false, "failed to load file definition");
@@ -20 +20 @@
     }
     if (!file) {
-        // look for the file on the argument list
-        file = pmFPAfileDefineFromArgs(&status, config, filerule, argname);
+        // look for the file on the RUN metadata
+        file = pmFPAfileDefineFromRun(&status, NULL, config, filerule);
         if (!status) {
             psError(PS_ERR_UNKNOWN, false, "failed to load file definition");

branches/eam_branches/20091201/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;
+
+          // for unity gain, there is no modification for the readnoise, note that it has (effectively) been updated
+          psMetadataRemoveKey(input->parent->concepts, "CELL.READNOISE.UPDATE");
+        } 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.
@@ -89 +110 @@
             psFree (binning);
         }
+
         pmReadoutGenerateVariance(input, noiseImage, true);
         psFree (noiseImage);