Changeset 42098

Timestamp:

Feb 28, 2022, 4:31:43 PM (4 years ago)

Author:

eugene

Message:

macro to turn on/off option to allow stacks with invalid input warp states; speed up queuing for staticsky jobs

Location:

trunk/ippTasks

Files:

• stack.pro (modified) (2 diffs)
• staticsky.pro (modified) (2 diffs)

trunk/ippTasks/stack.pro

@@ -27 +27 @@
 
 ### Database lists
-$stackSkycell_DB = 0
-$stack_revert_DB = 0
-$stackSummary_DB = 0
+if (not($?stackSkycell_DB)) set stackSkycell_DB = 0
+if (not($?stack_revert_DB)) set stack_revert_DB = 0
+if (not($?stackSummary_DB)) set stackSummary_DB = 0
+
+if (not($?stackIgnoreWarpState))
+  $stackIgnoreWarpState = 
+end
+
+# is this name ridiculous?
+macro stack.ignore.warp.stack.set
+  if ($0 != 2)
+    echo "USAGE: stack.ignore.warp.stack.set (on/off)"
+    break
+  end
+
+  if ("$1" == "on")
+    $stackIgnoreWarpState = -ignore-warp-state
+  else
+    $stackIgnoreWarpState = 
+  end
+  stack.ignore.warp.stack.get
+end
+macro stack.ignore.warp.stack.get
+  if ("$stackIgnoreWarpState" == "-ignore-warp-state")
+    echo "stackIgnoreWarpState is now ON : $stackIgnoreWarpState"
+    return
+  end
+  if ("$stackIgnoreWarpState" == "")
+    echo "stackIgnoreWarpState is now OFF : $stackIgnoreWarpState"
+    return
+  end
+
+  echo "stackIgnoreWarpState has an unexpected value : $stackIgnoreWarpState"
+end
 
 ### Check status of stacking tasks
@@ -115 +146 @@
   task.exec
     if ($LABEL:n == 0) break
-    $run = stacktool -tosum
+    $run = stacktool -tosum $stackIgnoreWarpState
     if ($DB:n == 0)
       option DEFAULT

trunk/ippTasks/staticsky.pro

@@ -145 +145 @@
 
   task.exec
+    # if we are unable to run the 'exec', use a long retry time
+    periods -exec $RUNEXEC
+
     book npages staticskyResult -var N
     if ($N == 0) break
@@ -198 +201 @@
       echo command $run
     end
+    # if we are able to run the 'exec', use a short retry time
+    periods -exec 0.05
     command $run
   end