Changeset 28164 for branches/czw_branch/20100519/ippTools/src/chiptool.c

Timestamp:

May 28, 2010, 3:09:59 PM (16 years ago)

Author:

watersc1

Message:

JPEG work should be done. Transitioning to try to pick up stackAssociation concept in this branch as well.

Location:

branches/czw_branch/20100519

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/chiptool.c (modified) (4 diffs)

branches/czw_branch/20100519/ippTools/src

@@ -20 +20 @@
 flatcorr
 guidetool
+labeltool
 magicdstool
 magictool
@@ -37 +38 @@
 stamp-h1
 warptool
+

@@ -20 +20 @@
 flatcorr
 guidetool
+labeltool
 magicdstool
 magictool
@@ -37 +38 @@
 stamp-h1
 warptool
+

branches/czw_branch/20100519/ippTools/src/chiptool.c

@@ -141 +141 @@
     )
 {
-    // start a transaction so we don't end up with an exp without any associted
+    // start a transaction so we don't end up with an exp without any associated
     // imfiles
     if (!psDBTransaction(config->dbh)) {
@@ -1398 +1398 @@
         
         psString software_ver = NULL;
-        psS32 maskfrac_npix = 0;
+        psS64 maskfrac_npix = 0;
         psF32 maskfrac_static = 0;
         psF32 maskfrac_dynamic = 0;
@@ -1417 +1417 @@
         }
         psMetadataAddStr(row, PS_LIST_TAIL, "software_ver",  0, "Software version", software_ver);
-        psMetadataAddS32(row, PS_LIST_TAIL, "maskfrac_npix",  0, "Number of pixels used for mask stats", maskfrac_npix);
+        psMetadataAddS32(row, PS_LIST_TAIL, "maskfrac_npix",  0, "Number of pixels used for mask stats", (psS32) maskfrac_npix);
         psMetadataAddF32(row, PS_LIST_TAIL, "maskfrac_static",  0, "Fraction of static masked pixels", maskfrac_static);
         psMetadataAddF32(row, PS_LIST_TAIL, "maskfrac_dynamic",  0, "Fraction of dynamic masked pixels", maskfrac_dynamic);
         psMetadataAddF32(row, PS_LIST_TAIL, "maskfrac_magic",  0, "Fraction of magic masked pixels", maskfrac_magic);
         psMetadataAddF32(row, PS_LIST_TAIL, "maskfrac_advisory",  0, "Fraction of advisory pixels", maskfrac_advisory);
-        psWarning("ADVANCE %ld %s %d %f %f %f %f\n",chip_id,software_ver,maskfrac_npix,maskfrac_static,maskfrac_dynamic,maskfrac_magic,maskfrac_advisory);
+/*      psWarning("ADVANCE %ld %s %d %f %f %f %f\n",chip_id,software_ver,maskfrac_npix,maskfrac_static,maskfrac_dynamic,maskfrac_magic,maskfrac_advisory); */
         chipRunRow *chipRun = chipRunObjectFromMetadata(row);
         if (!psDBTransaction(config->dbh)) {
@@ -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

@@ -20 +20 @@
 flatcorr
 guidetool
+labeltool
 magicdstool
 magictool
@@ -37 +38 @@
 stamp-h1
 warptool
+