Changeset 28056 for trunk/ippTools/src/chiptool.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/chiptool.c (modified) (2 diffs)

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