Changeset 28056

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.

Location:

trunk

Files:

• dbconfig/cam.md (modified) (1 diff)
• dbconfig/changes.txt (modified) (1 diff)
• dbconfig/chip.md (modified) (1 diff)
• dbconfig/diff.md (modified) (1 diff)
• dbconfig/warp.md (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (4 diffs)
• ippTools/src/camtool.c (modified) (1 diff)
• ippTools/src/chiptool.c (modified) (2 diffs)
• ippTools/src/difftool.c (modified) (1 diff)
• ippTools/src/pxtools.c (modified) (4 diffs)
• ippTools/src/pxtools.h (modified) (1 diff)
• ippTools/src/warptool.c (modified) (1 diff)

trunk/dbconfig/cam.md

@@ -15 +15 @@
     magicked    S64         0
     software_ver    STR         16
-    maskfrac_npix S32       0
+    maskfrac_npix F32       0.0
     maskfrac_static F32     0.0
     maskfrac_dynamic F32    0.0

trunk/dbconfig/changes.txt

@@ -1680 +1680 @@
 ALTER TABLE diffSkyfile ADD COLUMN maskfrac_advisory FLOAT after maskfrac_magic;
 
+ALTER TABLE chipRun CHANGE maskfrac_npix  maskfrac_npix FLOAT;
+ALTER TABLE camRun CHANGE maskfrac_npix  maskfrac_npix FLOAT;
+ALTER TABLE warpRun CHANGE maskfrac_npix maskfrac_npix FLOAT; 
+ALTER TABLE diffRun CHANGE maskfrac_npix maskfrac_npix FLOAT;

trunk/dbconfig/chip.md

@@ -15 +15 @@
     magicked    S64         0
     software_ver    STR         16
-    maskfrac_npix S32       0
+    maskfrac_npix F32       0.0
     maskfrac_static F32     0.0
     maskfrac_dynamic F32    0.0

trunk/dbconfig/diff.md

@@ -16 +16 @@
     magicked    S64         0
     software_ver    STR         16
-    maskfrac_npix S32       0
+    maskfrac_npix F32       0.0
     maskfrac_static F32     0.0
     maskfrac_dynamic F32    0.0

trunk/dbconfig/warp.md

@@ -26 +26 @@
     magicked    S64         0
     software_ver    STR         16
-    maskfrac_npix S32       0
+    maskfrac_npix F32       0.0
     maskfrac_static F32     0.0
     maskfrac_dynamic F32    0.0

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -277 +277 @@
     magicked BIGINT,
     software_ver VARCHAR(16),
-    maskfrac_npix INT,
+    maskfrac_npix FLOAT,
     maskfrac_static FLOAT,
     maskfrac_dynamic FLOAT,
@@ -400 +400 @@
     magicked BIGINT,
     software_ver VARCHAR(16),
-    maskfrac_npix INT,
+    maskfrac_npix FLOAT,
     maskfrac_static FLOAT,
     maskfrac_dynamic FLOAT,
@@ -892 +892 @@
     magicked BIGINT,
     software_ver VARCHAR(16),
-    maskfrac_npix INT,
+    maskfrac_npix FLOAT,
     maskfrac_static FLOAT,
     maskfrac_dynamic FLOAT,
@@ -1056 +1056 @@
         magicked BIGINT,
         software_ver VARCHAR(16),
-        maskfrac_npix INT,
+        maskfrac_npix FLOAT,
         maskfrac_static FLOAT,
         maskfrac_dynamic FLOAT,

trunk/ippTools/src/camtool.c

@@ -675 +675 @@
     // Set chipRun.maskfrac* to the appropriate values.
     if (maskfrac_npix) {
-      if (!pxSetRunMaskfrac(config, "camRun", "cam_id",cam_id, maskfrac_npix, maskfrac_static,
+      if (!pxSetRunMaskfrac(config, "camRun", "cam_id",cam_id, (float) maskfrac_npix, maskfrac_static,
                             maskfrac_dynamic, maskfrac_magic, maskfrac_advisory)) {
         if (!psDBRollback(config->dbh)) {

trunk/ippTools/src/chiptool.c

@@ -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)) {

trunk/ippTools/src/difftool.c

@@ -717 +717 @@
 
         psString software_ver = NULL;
-        psS32 maskfrac_npix = 0;
+        psS64 maskfrac_npix = 0;
         psF32 maskfrac_static = 0;
         psF32 maskfrac_dynamic = 0;

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,

trunk/ippTools/src/pxtools.h

@@ -55 +55 @@
 psString pxMergeCodeVersions(psString version1, psString version2);
 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);
 bool pxSetRunSoftware(pxConfig *config, const psString tableName, const psString stage_id_name, const psS64 stage_id,
                       psString software_ver);
 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);
 

trunk/ippTools/src/warptool.c

@@ -1163 +1163 @@
 
         psString software_ver = NULL;
-        psS32 maskfrac_npix = 0;
+        psS64 maskfrac_npix = 0;
         psF32 maskfrac_static = 0;
         psF32 maskfrac_dynamic = 0;