Changeset 35230 for trunk/ippTools

Timestamp:

Mar 5, 2013, 9:27:41 AM (13 years ago)

Author:

bills

Message:

fix bug in handling user supplied zpt values in -definerelexp

File:

• trunk/ippTools/src/releasetool.c (modified) (2 diffs)

trunk/ippTools/src/releasetool.c

@@ -364 +364 @@
     PXOPT_LOOKUP_STR(state, config->args,     "-set_state", true, false);
     PXOPT_LOOKUP_U32(flags, config->args,     "-set_flags", false, false);
-    PXOPT_LOOKUP_F32(zpt_obs, config->args,   "-set_zpt_obs", false, false);
-    PXOPT_LOOKUP_F32(zpt_stdev, config->args, "-set_zpt_stdev", false, false);
+    PXOPT_LOOKUP_F32(user_zpt_obs, config->args,   "-set_zpt_obs", false, false);
+    PXOPT_LOOKUP_F32(user_zpt_stdev, config->args, "-set_zpt_stdev", false, false);
     PXOPT_LOOKUP_STR(path_base, config->args, "-set_path_base", false, false);
     PXOPT_LOOKUP_S16(fault, config->args,     "-set_fault", false, false);
@@ -431 +431 @@
         psS64 chip_id = psMetadataLookupS64(&status, md, "chip_id");
         psS64 cam_id = psMetadataLookupS64(&status, md, "cam_id");
+
         // if zpt_obs or zpt_stdev were not supplied use the results from the camRun
-        if (!isfinite(zpt_obs)) {
+        psF32 zpt_obs, zpt_stdev;
+        if (!isfinite(user_zpt_obs)) {
             zpt_obs = psMetadataLookupF32(&status, md, "zpt_obs");
-        }
-        if (!isfinite(zpt_stdev)) {
+        } else {
+            zpt_obs = user_zpt_obs;
+        }
+        if (!isfinite(user_zpt_stdev)) {
             zpt_stdev = psMetadataLookupF32(&status, md, "zpt_stdev");
+        } else {
+            zpt_stdev = user_zpt_stdev;
         }