Changeset 26624

Timestamp:

Jan 19, 2010, 1:18:48 PM (16 years ago)

Author:

watersc1

Message:

These are the versions I'm using for my final automatic queueing test this week. If everything works correctly on wed/thur/fri, I'll call them finished.

Location:

trunk

Files:

• ippScripts/scripts/automate_stacks.pl (modified) (4 diffs)
• ippTasks/nightly_stacks.pro (modified) (2 diffs)

trunk/ippScripts/scripts/automate_stacks.pl

@@ -156 +156 @@
 }
 if (defined($check_stacks)) {
-    $metadata_out{nsState} = 'QUEUESTACKS';
+    $metadata_out{nsState} = 'TOWARP';
     &execute_stacks($date,"pretend");
+    if ($metadata_out{nsState} eq 'FORCETOWARP') {
+        $metadata_out{nsState} = 'TOWARP';
+    }
     return_metadata($date);
     exit(0);
@@ -524 +527 @@
         foreach my $filter (@filter_list) {
             my ($Nexposures,$NprocChips,$NprocWarps,$Nalready) = pre_stack_queue($date,$target,$filter);
-            if (($NprocChips != $NprocWarps)||($NprocWarps == 0)||($NprocChips == 0)) {
+            if (($NprocChips != $NprocWarps)) { #||($NprocWarps == 0)||($NprocChips == 0)) {
                 print STDERR "execute_stacks: Target $target on $date is not fully processed. ($NprocChips $NprocWarps)\n";
-                $metadata_out{nsState} = 'TOWARP';
+                $metadata_out{nsState} = 'FORCETOWARP';
                 next;
             }
@@ -537 +540 @@
                 next;
             }
+            unless ($metadata_out{nsState} eq 'FORCETOWARP') {
+                $metadata_out{nsState} = 'QUEUESTACKS';
+            }
             unless(defined($pretend)) {
                 print STDERR "execute_stacks: Target $target in filter $filter on $date has exposures and will be queued.\n";
@@ -545 +551 @@
     
 }
-            
+
 # Utilities
 

trunk/ippTasks/nightly_stacks.pro

@@ -120 +120 @@
 task              ns.initday.load
   host            local
-  periods         -poll 86400
-  periods         -exec 86400
+  periods         -poll $LOADPOLL
+  periods         -exec $LOADEXEC
   periods         -timeout 30
+  trange          16:30:00 17:30:00 -nmax 1
   npending        1
 
@@ -405 +406 @@
 #    convert 'stdout' to book format
     book delpage nsData $options:0
-    ipptool2book stdout nsData -uniq -key date
+# We've queued up stacking. We're done with this date, so don't reload the page.
+#    ipptool2book stdout nsData -uniq -key date
     if ($VERBOSE > 2)
         book listbook nsData