Changeset 28043 for trunk/ippTools/src/chiptool.c

Timestamp:

May 19, 2010, 5:13:52 PM (16 years ago)

Author:

watersc1

Message:

Merging czw_branch (maskstats and software versions) back into the trunk

Location:

trunk

Files:

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

trunk/ippTools/src/chiptool.c

@@ -585 +585 @@
     PXOPT_LOOKUP_S64(magicked, config->args,       "-magicked", false, false);
 
+    PXOPT_LOOKUP_STR(ver_pslib, config->args, "-ver_pslib", false, false);
+    PXOPT_LOOKUP_STR(ver_psmodules, config->args, "-ver_psmodules", false, false);
+    PXOPT_LOOKUP_STR(ver_psphot, config->args, "-ver_psphot", false, false);
+    PXOPT_LOOKUP_STR(ver_psastro, config->args, "-ver_psastro", false, false);
+    PXOPT_LOOKUP_STR(ver_ppstats, config->args, "-ver_ppstats", false, false);
+    PXOPT_LOOKUP_STR(ver_ppimage, config->args, "-ver_ppimage", false, false);
+    PXOPT_LOOKUP_STR(ver_streaks, config->args, "-ver_streaks", false, false);
+
+    PXOPT_LOOKUP_S32(maskfrac_npix, config->args, "-maskfrac_npix", false, false);
+    PXOPT_LOOKUP_F32(maskfrac_static, config->args, "-maskfrac_static", false, false);
+    PXOPT_LOOKUP_F32(maskfrac_dynamic, config->args, "-maskfrac_dynamic", false, false);
+    PXOPT_LOOKUP_F32(maskfrac_magic, config->args, "-maskfrac_magic", false, false);
+    PXOPT_LOOKUP_F32(maskfrac_advisory, config->args, "-maskfrac_advisory", false, false);
+
+    psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s psastro %s ppstats %s ppImage %s streaks %s\n",
+            ver_pslib,ver_psmodules,ver_psphot,ver_psastro,ver_ppstats,ver_ppimage,ver_streaks);
+    psString ver_code = NULL;
+    if ((ver_pslib)&&(ver_psmodules)) {
+      ver_code = pxMergeCodeVersions(ver_pslib,ver_psmodules);
+    }
+    if (ver_psphot) {
+      ver_code = pxMergeCodeVersions(ver_code,ver_psphot);
+    }
+    if (ver_psastro) {
+      ver_code = pxMergeCodeVersions(ver_code,ver_psastro);
+    }
+    if (ver_ppstats) {
+      ver_code = pxMergeCodeVersions(ver_code,ver_ppstats);
+    }
+    if (ver_ppimage) {
+      ver_code = pxMergeCodeVersions(ver_code,ver_ppimage);
+    }
+    if (ver_streaks) {
+      ver_code = pxMergeCodeVersions(ver_code,ver_streaks);
+    }
+    
     // default values
     PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
@@ -661 +697 @@
                                    fault,
                                    quality,
-                                   magicked
+                                   magicked,
+                                   ver_code,
+                                   maskfrac_npix,
+                                   maskfrac_static,
+                                   maskfrac_dynamic,
+                                   maskfrac_magic,
+                                   maskfrac_advisory
             )) {
         // rollback
@@ -1353 +1395 @@
         psMetadata *row = output->data[i];
 
+        psS64 chip_id = psMetadataLookupS64(NULL,row,"chip_id");
+        
+        psString software_ver = NULL;
+        psS32 maskfrac_npix = 0;
+        psF32 maskfrac_static = 0;
+        psF32 maskfrac_dynamic = 0;
+        psF32 maskfrac_magic = 0;
+        psF32 maskfrac_advisory = 0;
+
+        // Calculate run level masking and software state
+        if (!pxCoalesceRunStatus(config,"chiptool_coalesce_run.sql",chip_id,
+                                 &software_ver,&maskfrac_npix,
+                                 &maskfrac_static,&maskfrac_dynamic,
+                                 &maskfrac_magic,&maskfrac_advisory)) {
+          psError(PS_ERR_UNKNOWN, false, "failed to generate run level statistics");
+          psFree(output);
+          if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+          }
+          return(false);
+        }
+        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);
+        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);
         chipRunRow *chipRun = chipRunObjectFromMetadata(row);
         if (!psDBTransaction(config->dbh)) {
@@ -1359 +1429 @@
         }
 
+        // 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");
+          }
+          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");
+          }
+          return(false);
+        }
         // set chipRun.state to 'stop' and update the magicked state
         if (!pxchipRunSetState(config, chipRun->chip_id, "full", chipRun->magicked)) {
@@ -1383 +1474 @@
         // stop
         if (!pxcamQueueByChipID(config,
-                    chipRun->chip_id,
-                    chipRun->workdir,
-                    chipRun->label,
-                    chipRun->data_group,
-                    chipRun->dist_group,
-                    chipRun->reduction,
-                    chipRun->expgroup,
-                    chipRun->dvodb,
-                    chipRun->tess_id,
-                    chipRun->end_stage,
-                    chipRun->magicked,
-                    NULL    // note does not propagate
+                                chipRun->chip_id,
+                                chipRun->workdir,
+                                chipRun->label,
+                                chipRun->data_group,
+                                chipRun->dist_group,
+                                chipRun->reduction,
+                                chipRun->expgroup,
+                                chipRun->dvodb,
+                                chipRun->tess_id,
+                                chipRun->end_stage,
+                                chipRun->magicked,
+                                NULL    // note does not propagate
         )) {
            if (!psDBRollback(config->dbh)) {