Changeset 17702 for branches/eam_branch_20080511/ppSim/src/ppSimMakeDark.c

Timestamp:

May 15, 2008, 12:01:36 PM (18 years ago)

Author:

eugene

Message:

working on getting the input image options right

File:

• branches/eam_branch_20080511/ppSim/src/ppSimMakeDark.c (modified) (1 diff)

branches/eam_branch_20080511/ppSim/src/ppSimMakeDark.c

@@ -11 +11 @@
     psMetadata *recipe = psMetadataLookupMetadata(&mdok, config->recipes, PPSIM_RECIPE); // Recipe
 
-    bool dark = psMetadataLookupBool(&status, recipe, "DARK"); // Generate a DARK?
+    bool dark = psMetadataLookupBool(&mdok, recipe, "DARK"); // Generate a DARK?
     if (!dark) return true;
 
-    float darkRate = psMetadataLookupF32(NULL, recipe, "DARK.RATE"); // Dark rate
-    float expTime  = psMetadataLookupF32(NULL, recipe, "EXPTIME"); // Exposure time
+    float darkRate = psMetadataLookupF32(&mdok, recipe, "DARK.RATE"); // Dark rate
+    if (isnan(darkRate)) {
+      psError(PS_ERR_UNKNOWN, false, "missing DARK.RATE\n");
+      return false;
+    }
+
+    float expTime  = psMetadataLookupF32(&mdok, recipe, "EXPTIME"); // Exposure time
+    if (isnan(expTime)) {
+      psError(PS_ERR_UNKNOWN, false, "missing EXPTIME\n");
+      return false;
+    }
+
+    psTrace("ppSim", 6, "darkRate: %f, expTime: %f\n", darkRate, expTime);
 
     for (int y = 0; y < signal->numRows; y++) {