Changeset 28056 for trunk/ippTools/src/pxtools.c

Timestamp:

May 20, 2010, 5:27:29 PM (16 years ago)

Author:

watersc1

Message:

Updates to fix the fact that the set of warpSkyfiles for a given warpRun contain more than a psS32 worth of pixels.

File:

• trunk/ippTools/src/pxtools.c (modified) (4 diffs)

trunk/ippTools/src/pxtools.c

@@ -94 +94 @@
 
 bool pxCoalesceRunStatus(pxConfig *config, const psString dbQFile, psS64 stage_id, psString *software_ver,
-                         psS32 *maskfrac_npix, psF32 *maskfrac_static, psF32 *maskfrac_dynamic,
+                         psS64 *maskfrac_npix, psF32 *maskfrac_static, psF32 *maskfrac_dynamic,
                          psF32 *maskfrac_magic, psF32 *maskfrac_advisory) {
   psString query = pxDataGet(dbQFile);
@@ -124 +124 @@
 
     *software_ver = pxMergeCodeVersions(*software_ver,this_version);
-
+    printf("%ld : %d %f %f %f %f <-> %ld %f %f %f %f\n",i,this_npix,this_static,this_dynamic,this_magic,this_advisory,
+           *maskfrac_npix,*maskfrac_static,*maskfrac_dynamic,*maskfrac_magic,*maskfrac_advisory);
     if (this_npix > 0) {
       *maskfrac_static = ((*maskfrac_static * *maskfrac_npix) + (this_npix * this_static)) / (this_npix + *maskfrac_npix);
@@ -140 +141 @@
                       psString software_ver) {
   char *query = "UPDATE %s SET software_ver = '%s' WHERE %s = %" PRId64;
-  printf(query,tableName,software_ver,stage_id_name,stage_id);
+/*   printf(query,tableName,software_ver,stage_id_name,stage_id); */
   if (!p_psDBRunQueryF(config->dbh,query,tableName,software_ver,stage_id_name,stage_id)) {
     psError(PS_ERR_UNKNOWN, false,
@@ -150 +151 @@
 }
 bool pxSetRunMaskfrac(pxConfig *config, const psString tableName, const psString stage_id_name, const psS64 stage_id,
-                      psS32 maskfrac_npix, psF32 maskfrac_static, psF32 maskfrac_dynamic,
+                      psS64 maskfrac_npix, psF32 maskfrac_static, psF32 maskfrac_dynamic,
                       psF32 maskfrac_magic, psF32 maskfrac_advisory) {
-  char *query = "UPDATE %s SET maskfrac_npix = %d, maskfrac_static = %f, maskfrac_dynamic = %f, maskfrac_magic = %f, maskfrac_advisory = %f WHERE %s = %" PRId64;
-  if (!p_psDBRunQueryF(config->dbh,query,tableName,maskfrac_npix,maskfrac_static,
+  char *query = "UPDATE %s SET maskfrac_npix = %f, maskfrac_static = %f, maskfrac_dynamic = %f, maskfrac_magic = %f, maskfrac_advisory = %f WHERE %s = %" PRId64;
+  if (!p_psDBRunQueryF(config->dbh,query,tableName,(float) maskfrac_npix,maskfrac_static,
                        maskfrac_dynamic, maskfrac_magic,maskfrac_advisory,stage_id_name,stage_id)) {
     psError(PS_ERR_UNKNOWN, false,