Changeset 28055

Timestamp:

May 20, 2010, 4:37:23 PM (16 years ago)

Author:

watersc1

Message:

Fix unpopulated skyfile bug (hopefully)

Location:

trunk/ippTools/src

Files:

• chiptool.c (modified) (1 diff)
• pxtools.c (modified) (1 diff)
• warptool.c (modified) (1 diff)

trunk/ippTools/src/chiptool.c

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

trunk/ippTools/src/pxtools.c

@@ -125 +125 @@
     *software_ver = pxMergeCodeVersions(*software_ver,this_version);
 
-    *maskfrac_static = ((*maskfrac_static * *maskfrac_npix) + (this_npix * this_static)) / (this_npix + *maskfrac_npix);
-    *maskfrac_dynamic = ((*maskfrac_dynamic * *maskfrac_npix) + (this_npix * this_dynamic)) / (this_npix + *maskfrac_npix);
-    *maskfrac_magic = ((*maskfrac_magic * *maskfrac_npix) + (this_npix * this_magic)) / (this_npix + *maskfrac_npix);
-    *maskfrac_advisory = ((*maskfrac_advisory * *maskfrac_npix) + (this_npix * this_advisory)) / (this_npix + *maskfrac_npix);
-    *maskfrac_npix += this_npix;
+    if (this_npix > 0) {
+      *maskfrac_static = ((*maskfrac_static * *maskfrac_npix) + (this_npix * this_static)) / (this_npix + *maskfrac_npix);
+      *maskfrac_dynamic = ((*maskfrac_dynamic * *maskfrac_npix) + (this_npix * this_dynamic)) / (this_npix + *maskfrac_npix);
+      *maskfrac_magic = ((*maskfrac_magic * *maskfrac_npix) + (this_npix * this_magic)) / (this_npix + *maskfrac_npix);
+      *maskfrac_advisory = ((*maskfrac_advisory * *maskfrac_npix) + (this_npix * this_advisory)) / (this_npix + *maskfrac_npix);
+      *maskfrac_npix += this_npix;
+    }
   }
   psFree(output);

trunk/ippTools/src/warptool.c

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