Changeset 27840 for branches/simtest_nebulous_branches/ppSim/src/ppSimAddNoise.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ppSim (modified) (1 prop)
• ppSim/src/ppSimAddNoise.c (modified) (1 diff)

branches/simtest_nebulous_branches/ppSim/src/ppSimAddNoise.c

@@ -16 +16 @@
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSIM_RECIPE); // Recipe
 
-    float gain = psMetadataLookupF32(NULL, cell->concepts, "CELL.GAIN"); // CCD gain, e/ADU
+    // the recipe should set GAIN to NAN, and only modify to override the concept value
+    float gain = psMetadataLookupF32(&mdok, recipe, "GAIN"); // CCD gain, e/ADU
     if (isnan(gain)) {
-        psWarning("CELL.GAIN is not set; reverting to recipe value GAIN.");
-        gain = psMetadataLookupF32(&mdok, recipe, "GAIN");
+        gain = psMetadataLookupF32(&mdok, cell->concepts, "CELL.GAIN");
         if (!mdok) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Unable to find GAIN in recipe.");
-            return false;
+            psWarning("CELL.GAIN is not set; assuming gain of 1.0.");
+            gain = 1.0;
         }
     }