Changeset 39803

Timestamp:

Nov 4, 2016, 3:13:53 PM (10 years ago)

Author:

watersc1

Message:

Updated version of nightly_science that I believe fixes the missing diff issue.

Location:

branches/czw_branch/20160809

Files:

• ippScripts/scripts/nightly_science.pl (modified) (6 diffs)
• ippconfig/recipes/nightly_science.config (modified) (1 diff)

branches/czw_branch/20160809/ippScripts/scripts/nightly_science.pl

@@ -1509 +1509 @@
             my $this_comment = ${ $this_warp }[3];
             my $this_exp_id  = ${ $this_warp }[0];
-            if ($comment_hash{$this_comment} == $this_exp_id) {
+            if ((exists($comment_hash{$this_comment}))&&
+                ($comment_hash{$this_comment} == $this_exp_id)) {
                 push @keep_warps, $this_warp;
             }
             else {
-                print STDERR "diff_queue: excluding $this_exp_id for $this_object due to duplicate comment string $this_comment\n";
+                print STDERR "diff_queue: excluding $this_exp_id for $this_object due to not being an accepted comment string $this_comment\n";
             }
         }
@@ -1541 +1542 @@
 
             my $template_exp_id = ${ $template_warp }[0];
-            
+            my $template_comment = ${ $template_warp }[3];
+
             my $input_warp_id = ${ $input_warp }[1];
             my $template_warp_id = ${ $template_warp }[1];
@@ -1567 +1569 @@
             if (verify_uniqueness_diff($input_warp_id,$template_warp_id,$date,$target) != 0) {
                 $Nqueued++;
-                print STDERR "Diffs already queued for this $date $target $input_exp_id $template_exp_id ($input_warp_id $template_warp_id) $this_object $input_comment\n";
+                print STDERR "Diffs already queued for this $date $target $input_exp_id $template_exp_id ($input_warp_id $template_warp_id) $this_object $input_comment $template_comment\n";
                 next;
             }
@@ -1658 +1660 @@
             my $this_comment = ${ $this_warp }[3];
             my $this_exp_id  = ${ $this_warp }[0];
-            if ($comment_hash{$this_comment} == $this_exp_id) {
+            if ((exists($comment_hash{$this_comment}))&&
+                ($comment_hash{$this_comment} == $this_exp_id)) {
                 push @keep_warps, $this_warp;
             }
             else {
-                print STDERR "desp_diff_queue: excluding $this_exp_id for $this_object due to duplicate comment string $this_comment\n";
+                print STDERR "desp_diff_queue: excluding $this_exp_id for $this_object due to not being an accepted comment string $this_comment\n";
             }
         }
@@ -1693 +1696 @@
 
             my $template_exp_id = ${ $template_warp }[0];
-            
+            my $template_comment = ${ $template_warp }[3];
+
             my $input_warp_id = ${ $input_warp }[1];
             my $template_warp_id = ${ $template_warp }[1];
@@ -1719 +1723 @@
             if (verify_uniqueness_diff($input_warp_id,$template_warp_id,$date,$target) != 0) {
                 $Nqueued++;
-                print STDERR "Diffs already queued for this $date $target $input_exp_id $template_exp_id ($input_warp_id $template_warp_id) $this_object $input_comment\n";
+                print STDERR "Diffs already queued for this $date $target $input_exp_id $template_exp_id ($input_warp_id $template_warp_id) $this_object $input_comment $template_comment\n";
                 next;
             }

branches/czw_branch/20160809/ippconfig/recipes/nightly_science.config

@@ -324 +324 @@
   REDUCTION STR SWEETSPOT
   ADDITIONAL_STACK_LABEL STR ecliptic.rp
+  DESPERATE_DIFFS BOOL TRUE
 #  REDUCTION STR SSTF_4SIG
 END