Changeset 26144 for trunk/ippTools

Timestamp:

Nov 13, 2009, 2:55:01 PM (17 years ago)

Author:

Paul Price

Message:

Better use of '-available' flag: queue a diff run with available stack templates, even if not all skycells have a template.

Location:

trunk/ippTools

Files:

• share/difftool_definewarpstack_part1.sql (modified) (1 diff)
• src/difftool.c (modified) (3 diffs)
• src/difftoolConfig.c (modified) (2 diffs)

trunk/ippTools/share/difftool_definewarpstack_part1.sql

@@ -25 +25 @@
     JOIN chipRun USING(chip_id)
     WHERE warp1 IS NOT NULL
+        AND warpRun.state = 'full'
     -- warp where hook %s
 ) AS diffExp USING(exp_id, warp_id)

trunk/ippTools/src/difftool.c

@@ -1205 +1205 @@
     psFree(warp2Where);
 
-    if (!available) {
-        // diff what's available, even if warp run has some faults and is incomplete
-        psStringAppend(&warp1Query, " AND warpRun.state = 'full'");
-        psStringAppend(&warp2Query, " AND warpRun.state = 'full'");
-    }
-
     // don't queue for exposures that have already been diff'd unless requested
     psString diffQuery = NULL;
@@ -1392 +1386 @@
 
         if (num == 0) {
-            psTrace("difftool", PS_LOG_INFO, "no skycells with stack found for %" PRId64, warp_id);
+            psTrace("difftool", PS_LOG_INFO, "no skycells with stack found for warp_id %" PRId64, warp_id);
             continue;
         }
@@ -1398 +1392 @@
         if (!available && (num != skycell_count)) {
             psTrace("difftool", PS_LOG_INFO, "%" PRId64 " skyfiles with stack found for warp_id %" PRId64
-                    " need %" PRId64, num, warp_id, skycell_count);
+                    " but need %" PRId64, num, warp_id, skycell_count);
             continue;
         }

trunk/ippTools/src/difftoolConfig.c

@@ -192 +192 @@
     psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-new-templates", 0, "also search for diffs with new template", false);
     psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-rerun", 0, "define new run even if one exists", false);
-    psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-available", 0, "define new run even if warpRun has some faults", false);
+    psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-available", 0, "define new run even if no stacks available for some skycells", false);
     psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
     psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-pretend", 0, "list results but to not queue", false);
@@ -328 +328 @@
     PXOPT_ADD_MODE("-topurgedskyfile", "set skyfile as purged", DIFFTOOL_MODE_TOPURGEDSKYFILE, topurgedskyfileArgs);
     PXOPT_ADD_MODE("-toscrubbedskyfile", "set skyfile as scrubbed", DIFFTOOL_MODE_TOSCRUBBEDSKYFILE, toscrubbedskyfileArgs);
-    
+
     if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {
         psError(PS_ERR_UNKNOWN, true, "option parsing failed");