Changeset 30261

Timestamp:

Jan 12, 2011, 4:53:01 PM (15 years ago)

Author:

watersc1

Message:

Add check for whether or not we are still processing. If we are, then we don't want to declare completion yet. This might be the root cause of a lot of stack and diff errors.

File:

• trunk/ippScripts/scripts/nightly_science.pl (modified) (6 diffs)

trunk/ippScripts/scripts/nightly_science.pl

@@ -1099 +1099 @@
     my $Npotential = 0;
     my $Nqueued = 0;
+    my $is_processing = 0;
     foreach my $target (sort (keys %science_config)) {
         if ($science_config{$target}{STACKABLE} == 1) {
@@ -1107 +1108 @@
                         print STDERR "execute_stacks: Target $target on $date is not fully processed. ($NprocChips $NprocWarps)\n";
                     }
+                    $is_processing = 1;
                     $metadata_out{nsStackState} = 'FORCETOWARP';
                     next;
@@ -1159 +1161 @@
     $metadata_out{nsStackPotential} = $Npotential;
     $metadata_out{nsStackQueued}    = $Nqueued;
-    if (($Npotential == $Nqueued)&&($metadata_out{nsObservingState} eq 'END_OF_NIGHT')) {
+    if (($Npotential == $Nqueued)&&($metadata_out{nsObservingState} eq 'END_OF_NIGHT')&&($is_processing == 0)) {
         $metadata_out{nsStackState} = 'FINISHED_STACKS';
     }   
@@ -1291 +1293 @@
     my $Npotential = 0;
     my $Nnoexp     = 0;
+    my $is_processing = 0;
     foreach my $target (sort (keys %science_config)) {
         if ($science_config{$target}{DIFFABLE} == 1) {
@@ -1296 +1299 @@
                 $Npotential ++;
                 my ($NprocChips,$NprocWarps) = pre_diff_queue($date,$observing_state,$target,$filter);
-#               if ((!defined($force_diff_count))&&($NprocChips != $NprocWarps)) {
-#                   if ($debug == 1) {
-#                       print STDERR "execute_diffs: Target $target in filter $filter on $date is not fully processed. ($NprocChips $NprocWarps)\n";
-#                   }
-#                     $metadata_out{nsDiffState} = 'FORCETOWARP';
-#                     next;
-#                 }
+                if ((!defined($force_diff_count))&&($NprocChips != $NprocWarps)) {
+                    if ($debug == 1) {
+                        print STDERR "execute_diffs: Target $target in filter $filter on $date is not fully processed. ($NprocChips $NprocWarps)\n";
+                    }
+                    $is_processing = 1;
+                }
                 if ($NprocChips == 0) {
                     $Nnoexp ++;
@@ -1332 +1334 @@
         }
     }
-    if (($Npotential == $Nnoexp)&&($metadata_out{nsObservingState} eq 'END_OF_NIGHT')) {
+    if (($Npotential == $Nnoexp)&&($metadata_out{nsObservingState} eq 'END_OF_NIGHT')&&($is_processing == 0)) {
         $metadata_out{nsDiffState} = 'FINISHED_DIFFS';
     }