Changeset 35897

Timestamp:

Aug 6, 2013, 2:40:50 PM (13 years ago)

Author:

bills

Message:

add relExp.mcal

Location:

trunk

Files:

• dbconfig/changes.txt (modified) (1 diff)
• dbconfig/release.md (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 diff)
• ippTools/share/releasetool_listrelexp.sql (modified) (2 diffs)
• ippTools/src/releasetool.c (modified) (6 diffs)
• ippTools/src/releasetoolConfig.c (modified) (2 diffs)

trunk/dbconfig/changes.txt

@@ -2427 +2427 @@
 ALTER TABLE ippRelease ADD COLUMN dvodb VARCHAR(255) DEFAULT NULL AFTER priority;
 ALTER TABLE ippRelease ADD COLUMN ubercal_file VARCHAR(255) DEFAULT NULL AFTER dvodb;
-ALTER TABLE relExp ADD COLUMN ubercal_dist INT DEFAULT 0 AFTER zpt_stdev;
+ALTER TABLE relExp ADD COLUMN mcal FLOAT AFTER zpt_stdev;
+ALTER TABLE relExp ADD COLUMN ubercal_dist INT DEFAULT 0 AFTER mcal;
 
 UPDATE dbversion set schema_version = '1.1.77', updated= CURRENT_TIMESTAMP();

trunk/dbconfig/release.md

@@ -27 +27 @@
     zpt_obs     F32     0
     zpt_stdev   F32     0
+    mcal        F32     0
     ubercal_dist S32    0
     path_base   STR     255

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -2193 +2193 @@
     zpt_obs     FLOAT,          -- calibrated zero point for this release of
     zpt_stdev   FLOAT,          -- this exposure
+    mcal        FLOAT,          -- this exposure
     ubercal_dist INT,           -- ubercal distance (from dvo calibration)
     path_base   VARCHAR(255),   -- path_base of any supporting files for this

trunk/ippTools/share/releasetool_listrelexp.sql

@@ -7 +7 @@
     ippRelease.rel_id,
     ippRelease.priority,
+    ippRelease.dvodb,
+    ippRelease.ubercal_file,
     survey.surveyName,
     rawExp.exp_name,
@@ -12 +14 @@
     relExp.zpt_obs,
     relExp.zpt_stdev,
+    relExp.mcal,
     relExp.path_base,
     relExp.registered,

trunk/ippTools/src/releasetool.c

@@ -246 +246 @@
         sep = comma;
     }
+    if (dvodb) {
+        psStringAppend(&query, "%s dvodb = '%s'", sep, dvodb);
+        sep = comma;
+    }
+    if (ubercal_file) {
+        psStringAppend(&query, "%s ubercal_file = '%s'", sep, ubercal_file);
+        sep = comma;
+    }
 
     psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
@@ -372 +380 @@
     PXOPT_LOOKUP_F32(user_zpt_obs, config->args,   "-set_zpt_obs", false, false);
     PXOPT_LOOKUP_F32(user_zpt_stdev, config->args, "-set_zpt_stdev", false, false);
+    PXOPT_LOOKUP_F32(mcal,     config->args, "-set_mcal",  false, false);
     PXOPT_LOOKUP_S32(ubercal_dist, config->args, "-set_ubercal_dist", false, false);
     PXOPT_LOOKUP_STR(path_base, config->args, "-set_path_base", false, false);
@@ -463 +472 @@
             zpt_obs,
             zpt_stdev,
+            mcal,
             ubercal_dist,
             path_base,
@@ -504 +514 @@
     PXOPT_LOOKUP_STR(state,    config->args, "-set_state",  false, false);
     PXOPT_LOOKUP_U32(flags,    config->args, "-set_flags",  false, false);
-    PXOPT_LOOKUP_STR(path_base, config->args, "-set_path_base", false, false);
+    PXOPT_LOOKUP_STR(path_base,config->args, "-set_path_base", false, false);
     PXOPT_LOOKUP_F32(zpt_obs,  config->args, "-set_zpt_obs",  false, false);
     PXOPT_LOOKUP_F32(zpt_stdev,config->args, "-set_zpt_stdev",  false, false);
+    PXOPT_LOOKUP_F32(mcal,     config->args, "-set_mcal",  false, false);
     PXOPT_LOOKUP_S16(fault,    config->args, "-set_fault",  false, false);
     PXOPT_LOOKUP_S32(ubercal_dist, config->args, "-set_ubercal_dist", false, false);
     PXOPT_LOOKUP_BOOL(clearfault, config->args, "-clearfault",  false);
-    if (!state && !flags && !path_base && !isfinite(zpt_obs) && !isfinite(zpt_stdev) && !fault && !clearfault && !ubercal_dist) {
+    if (!state && !flags && !path_base && !isfinite(zpt_obs) && !isfinite(zpt_stdev) &&!isfinite(mcal)
+        && !fault && !clearfault && !ubercal_dist) {
         psError(PXTOOLS_ERR_CONFIG, true, "must set at least one column\n");
         return false;
@@ -566 +578 @@
         sep = comma;
     }
+    if (isfinite(mcal)) {
+        psStringAppend(&query, "%s relExp.mcal = %f", sep, mcal);
+        sep = comma;
+    }
     if (ubercal_dist) {
         psStringAppend(&query, "%s relExp.ubercal_dist = %d", sep, ubercal_dist);
@@ -582 +598 @@
 
     psU64 affected = psDBAffectedRows(config->dbh);
-    psLogMsg("releasetool", PS_LOG_INFO, "Updated %" PRIu64 " ippReleases", affected);
+    psLogMsg("releasetool", PS_LOG_INFO, "Updated %" PRIu64 " relExp rows", affected);
 
 

trunk/ippTools/src/releasetoolConfig.c

@@ -112 +112 @@
     psMetadataAddF32(definerelexpArgs,  PS_LIST_TAIL, "-set_zpt_obs", 0,    "define zero point", NAN);
     psMetadataAddF32(definerelexpArgs,  PS_LIST_TAIL, "-set_zpt_stdev", 0,  "define zero point stdev", NAN);
+    psMetadataAddF32(definerelexpArgs,  PS_LIST_TAIL, "-set_mcal", 0,       "define mcal", NAN);
     psMetadataAddS32(definerelexpArgs,  PS_LIST_TAIL, "-set_ubercal_dist", 0,  "define ubercal dist", 0);
     psMetadataAddStr(definerelexpArgs,  PS_LIST_TAIL, "-set_path_base", 0,  "define state", NULL);
@@ -131 +132 @@
     psMetadataAddF32(updaterelexpArgs,  PS_LIST_TAIL, "-set_zpt_obs", 0,    "define new zero point", NAN);
     psMetadataAddF32(updaterelexpArgs,  PS_LIST_TAIL, "-set_zpt_stdev", 0,  "define new zero point stdev", NAN);
+    psMetadataAddF32(updaterelexpArgs,  PS_LIST_TAIL, "-set_mcal", 0,       "define mcal", NAN);
     psMetadataAddS32(updaterelexpArgs,  PS_LIST_TAIL, "-set_ubercal_dist", 0, "define new ubercal dist", 0);
     psMetadataAddStr(updaterelexpArgs,  PS_LIST_TAIL, "-set_path_base", 0,  "define path_base", NULL);