Changeset 23688 for trunk/ippTools/src/warptool.c

Timestamp:

Apr 2, 2009, 2:51:37 PM (17 years ago)

Author:

Paul Price

Message:

Merging in branches/pap/ from r23685. Some conflicts, most notably in ippTools, but these resolved fairly simply. Only question mark is on regtool reversion, but I think I got it right. Everything builds fine.

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/src/warptool.c (modified) (7 diffs)

trunk/ippTools/src/warptool.c

@@ -609 +609 @@
     PXOPT_LOOKUP_STR(mapfile, config->args, "-mapfile", false, false);
     PXOPT_LOOKUP_S64(warp_id, config->args, "-warp_id", false, false);
-    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
+    PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
 
     if (!psDBTransaction(config->dbh)) {
@@ -616 +616 @@
     }
 
-    if (code == 0) {
+    if (fault == 0) {
         if (!parseAndInsertSkyCellMap(config, mapfile)) {
             psError(PS_ERR_UNKNOWN, false, "failed to inject mapfile: %s into the database", mapfile);
@@ -631 +631 @@
             NULL,   // tess_id
             NULL,   // class_id
-            code    // fault
+            fault    // fault
         );
     }
@@ -896 +896 @@
     PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false);
     PXOPT_LOOKUP_F32(good_frac, config->args, "-good_frac", false, false);
-    PXOPT_LOOKUP_BOOL(accept, config->args, "-accept", false);
     PXOPT_LOOKUP_BOOL(magicked, config->args, "-magicked", false);
 
     // default values
-    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
+    PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
+    PXOPT_LOOKUP_S16(quality, config->args, "-quality", false, false);
 
     // we don't want to insert the last skyfile in a run but then not mark the
@@ -927 +927 @@
                            ymin,
                            ymax,
-                           !accept,
-                           code,
+                           fault,
+                           quality,
                            magicked
         )) {
@@ -1112 +1112 @@
     PXOPT_COPY_STR(config->args, where, "-reduction",  "rawExp.reduction", "==");
     PXOPT_COPY_STR(config->args, where, "-label",      "warpRun.label", "==");
-    PXOPT_COPY_S16(config->args, where, "-code",       "warpSkyfile.fault", "==");
+    PXOPT_COPY_S16(config->args, where, "-fault",       "warpSkyfile.fault", "==");
 
     if (!psListLength(where->list)
@@ -1560 +1560 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    // warp_id, skycell_id, code are required
+    // warp_id, skycell_id, fault are required
     PXOPT_LOOKUP_S64(warp_id, config->args, "-warp_id", true, false);
     PXOPT_LOOKUP_STR(skycell_id, config->args, "-skycell_id", true, false);
-    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
+    PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
 
     psString query = pxDataGet("warptool_updateskyfile.sql");
 
-    if (!p_psDBRunQueryF(config->dbh, query, code, warp_id, skycell_id)) {
+    if (!p_psDBRunQueryF(config->dbh, query, fault, warp_id, skycell_id)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;