Changeset 30132

Timestamp:

Dec 21, 2010, 1:23:03 PM (15 years ago)

Author:

watersc1

Message:

fixed typos in Task, and added handler for End of night and no diffable exposures into script.

Location:

trunk

Files:

• ippScripts/scripts/nightly_science.pl (modified) (3 diffs)
• ippTasks/nightly_science.pro (modified) (10 diffs)

trunk/ippScripts/scripts/nightly_science.pl

@@ -1289 +1289 @@
     my $pretend = shift;
 
+    my $Npotential = 0;
+    my $Nnoexp     = 0;
     foreach my $target (sort (keys %science_config)) {
         if ($science_config{$target}{DIFFABLE} == 1) {
             foreach my $filter (@filter_list) {
+                $Npotential ++;
                 my ($NprocChips,$NprocWarps) = pre_diff_queue($date,$observing_state,$target,$filter);
 #               if ((!defined($force_diff_count))&&($NprocChips != $NprocWarps)) {
@@ -1301 +1304 @@
 #                 }
                 if ($NprocChips == 0) {
+                    $Nnoexp ++;
                     if ($debug == 1) {
                         print STDERR "execute_diffs: Target $target in filter $filter on $date has no exposures.\n";
@@ -1328 +1332 @@
         }
     }
+    if (($Npotential == $Nnoexp)&&($metadata_out{nsObservingState} eq 'END_OF_NIGHT')) {
+        $metadata_out{nsDiffState} = 'FINISHED_DIFFS';
+    }   
+
 }
 

trunk/ippTasks/nightly_science.pro

@@ -289 +289 @@
 #
 task              ns.stacks.load
+  active          false
   host            local
   periods         -poll $LOADPOLL
@@ -302 +303 @@
      book getword nsStacks $date nsStackState -var ns_STATE
      book getword nsDiffs $date nsDiffState -var ns_diff_STATE
-     book getword nsData $date dbname -var $DBNAME
+     book getword nsData $date dbname -var DBNAME
      book npages nsData -var Npages
 
@@ -312 +313 @@
      if ($ns_stackPAGE >= $Npages) set ns_stackPAGE = 0
      option $date
-     option $ns_diff_STATE
 
      if ("$ns_STATE" != "TOWARP") break
@@ -373 +373 @@
      book getword nsStacks $date nsStackState -var ns_STATE
      book getword nsDiffs $date nsDiffState -var ns_diff_STATE
-     book getword nsData $date dbname -var $DBNAME
+     book getword nsData $date dbname -var DBNAME
      book npages nsData -var Npages
 
@@ -383 +383 @@
      if ($ns_RstackPAGE >= $Npages) set ns_RstackPAGE = 0
      option $date
-     option $ns_diff_STATE
+
      if (("$ns_STATE" != "QUEUESTACKS")&&("$ns_STATE" != "TOWARP")&&("$ns_STATE" != "FORCETOWARP")) break
      $run = nightly_science.pl --queue_stacks --date $date --dbname $DBNAME
@@ -440 +440 @@
      book getpage nsData $ns_CstackPAGE -var date
      book getword nsStacks $date nsStackState -var ns_STATE
-     book getword nsData $date dbname -var $DBNAME
+     book getword nsData $date dbname -var DBNAME
      book npages nsData -var Npages
 
@@ -494 +494 @@
 #
 task              ns.diffs.load
+  active          false
   host            local
   periods         -poll $LOADPOLL
@@ -507 +508 @@
      book getword nsDiffs $date nsDiffState -var ns_STATE
      book getword nsStacks $date nsStackState -var ns_stack_STATE
-     book getword nsData $date dbname -var $DBNAME
+     book getword nsData $date dbname -var DBNAME
      book npages nsData -var Npages
 
@@ -575 +576 @@
      book getword nsDiffs $date nsDiffState -var ns_STATE
      book getword nsStacks $date nsStackState -var ns_stack_STATE
-     book getword nsData $date dbname -var $DBNAME
+     book getword nsData $date dbname -var DBNAME
      book npages nsData -var Npages
 
@@ -585 +586 @@
      if ($ns_RdiffPAGE >= $Npages) set ns_RdiffPAGE = 0
      option $date
-     option $ns_stack_STATE
-
-     if (("$ns_STATE" != "QUEUEDIFFS")&&("$ns_STATE" != "TOWARP")&&("$ns_STATE" != "FORCETOWARP")) break
+
+     if (("$ns_STATE" != "DIFFING")&&("$ns_STATE" != "QUEUEDIFFS")&&("$ns_STATE" != "TOWARP")&&("$ns_STATE" != "FORCETOWARP")) break
      $run = nightly_science.pl --queue_diffs --date $date --dbname $DBNAME
 #     add_standard_args $run