Changeset 35236 for branches/eam_branches/ipp-20130207/ippTools/src/disttool.c

Timestamp:

Mar 5, 2013, 2:24:05 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130207

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/disttool.c (modified) (12 diffs)

branches/eam_branches/ipp-20130207/ippTools/src/disttool.c

@@ -143 +143 @@
     // optional
     PXOPT_LOOKUP_BOOL(use_alternate, config->args, "-use_alternate", false);
-    PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
+    PXOPT_LOOKUP_BOOL(magic, config->args, "-magic", false);
     PXOPT_LOOKUP_STR(set_label, config->args, "-set_label", false, false);
     PXOPT_LOOKUP_STR(set_data_group, config->args, "-set_data_group", false, false);
@@ -175 +175 @@
             return false;
         }
-        if (no_magic) {
+        if (!magic) {
             psError(PXTOOLS_ERR_SYS, true, "no_magic forbidden with alternate inputs");
             return false;
@@ -187 +187 @@
     // an interest)
     // and exp_id to be supplied. We could add -exp_type and dateobs cuts to make it easier
-    if (!strcmp(stage, "raw") && no_magic && !(exp_id && dist_group && exp_type)) {
+    if (!strcmp(stage, "raw") && !magic && !(exp_id && dist_group && exp_type)) {
         psError(PXTOOLS_ERR_SYS, true, "exp_id, exp_type, and dist_group are required for raw stage if no_magic");
         return false;
@@ -204 +204 @@
             runJoinStr = "camRun.exp_id";
         }
-        if (!no_magic) {
+        if (magic) {
             query = pxDataGet("disttool_definebyquery_raw.sql");
         } else {
@@ -215 +215 @@
         }
 
-        if (!no_magic) {
+        if (magic) {
             if (label) {
                 psStringAppend(&query, " AND (magicDSRun.label = '%s')", label);
@@ -289 +289 @@
         }
         // fake stage doesn't require magic
-        no_magic = true;
+        magic = false;
     } else if (!strcmp(stage, "warp")) {
         magicRunType = "warpRun";
@@ -357 +357 @@
         }
         // stack stage doesn't require magic
-        no_magic = true;
+        magic = false;
     } else if (!strcmp(stage, "sky")) {
         magicRunType = "staticskyRun";
@@ -378 +378 @@
         }
         // (static)sky stage doesn't require magic
-        no_magic = true;
+        magic = false;
     } else if (!strcmp(stage, "SSdiff")) {
       magicRunType = "diffRun";
@@ -396 +396 @@
       }
 
-      no_magic = true;
+      magic = false;
     } else {
         psError(PS_ERR_UNKNOWN, true, "unknown value for stage: %s", stage);
@@ -408 +408 @@
 
     if (!strcmp(stage, "raw")) {
-        if (!no_magic) {
+        if (magic) {
             psStringAppend(&query, " AND (magicDSRun.re_place = %d)", !use_alternate);
             psStringAppend(&query, " AND (camRun.state = 'full')");
@@ -426 +426 @@
     psString joinHook = NULL;
 
-    if (!no_magic) {
+    if (magic) {
         psStringAppend(&query, " AND (%s.magicked > 0)", magicRunType);
     }
@@ -517 +517 @@
                 NULL,     // outdir
                 clean,
-                no_magic,
+                !magic,
                 use_alternate,
                 "new",