Changeset 28018

Timestamp:

May 18, 2010, 7:01:40 PM (16 years ago)

Author:

watersc1

Message:

Simtest tested version of the code. Everything has been checked to work except the camera stage data. Previous tests showed that camera stage worked on GPC1 data correctly.

File:

• branches/czw_branch/20100427/ippTools/src/difftool.c (modified) (1 diff)

branches/czw_branch/20100427/ippTools/src/difftool.c

@@ -735 +735 @@
         }
         // Set diffRun.software_ver to the appropriate value
-        if (!pxSetRunSoftware(config, "diffRun", "diff_id", diff_id, software_ver)) {
-          psError(PS_ERR_UNKNOWN, false, "failed to set diffRun.software_ver for diff_id: %" PRId64,
-                  diff_id);
-          psFree(output);
-          if (!psDBRollback(config->dbh)) {
-            psError(PS_ERR_UNKNOWN, false, "database error");
+        if (software_ver) {
+          if (!pxSetRunSoftware(config, "diffRun", "diff_id", diff_id, software_ver)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to set diffRun.software_ver for diff_id: %" PRId64,
+                    diff_id);
+            psFree(output);
+            if (!psDBRollback(config->dbh)) {
+              psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            return(false);
           }
-          return(false);
         }
         // Set diffRun.maskfrac* to the appropriate values.
-        if (!pxSetRunMaskfrac(config, "diffRun", "diff_id", diff_id, maskfrac_npix, maskfrac_static,
-                              maskfrac_dynamic, maskfrac_magic, maskfrac_advisory)) {
-          psError(PS_ERR_UNKNOWN, false, "failed to set diffRun.software_ver for diff_id: %" PRId64,
-                  diff_id);
-          psFree(output);
-          if (!psDBRollback(config->dbh)) {
-            psError(PS_ERR_UNKNOWN, false, "database error");
+        if (maskfrac_npix) {
+          if (!pxSetRunMaskfrac(config, "diffRun", "diff_id", diff_id, maskfrac_npix, maskfrac_static,
+                                maskfrac_dynamic, maskfrac_magic, maskfrac_advisory)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to set diffRun.software_ver for diff_id: %" PRId64,
+                    diff_id);
+            psFree(output);
+            if (!psDBRollback(config->dbh)) {
+              psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            return(false);
           }
-          return(false);
-        }       
+        }
         // set diffRun.state to 'full'
         if (!setdiffRunState(config, diff_id, "full", magicked)) {