Changeset 25158 for branches/czw_branch/cleanup/ippTools/src/difftool.c

Timestamp:

Aug 20, 2009, 12:42:13 PM (17 years ago)

Author:

watersc1

Message:

More merging

Location:

branches/czw_branch/cleanup

Files:

• . (modified) (1 prop)
• ippTools/src/difftool.c (modified) (2 diffs)

branches/czw_branch/cleanup/ippTools/src/difftool.c

@@ -584 +584 @@
     PXOPT_COPY_STR(config->args, where, "-tess_id", "diffRun.tess_id", "==");
     PXOPT_COPY_S16(config->args, where, "-fault", "diffSkyfile.fault", "==");
-    PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "==");
-    PXOPT_COPY_STR(config->args, where, "-warp_id", "warpRun.warp_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-exp_id", "rawInput.exp_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-exp_name", "rawInput.exp_name", "==");
+    PXOPT_COPY_STR(config->args, where, "-warp_id", "warpInput.warp_id", "==");
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -1179 +1179 @@
 
         if (!available && (num != skycell_count)) {
-            psTrace("difftool", PS_LOG_INFO, "%" PRId64 " skyfiles with stack found for warp_id %"
-                PRId64 " need %" PRId64, num, skycell_count, warp_id);
+            psTrace("difftool", PS_LOG_INFO, "%" PRId64 " skyfiles with stack found for warp_id %" PRId64
+                    " need %" PRId64, num, warp_id, skycell_count);
             continue;
         }