Changeset 42296

Timestamp:

Oct 19, 2022, 2:22:04 PM (4 years ago)

Author:

tdeboer

Message:

extra diff processing protection on desperate diffs

File:

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

trunk/ippScripts/scripts/nightly_science.pl

@@ -1567 +1567 @@
         # Each comment should only appear once. Therefore, if we see it more than once, we assume the first is extra.
         my %comment_hash = ();
+        my $Nbad = 0;
         foreach my $this_warp (@{ $warps }) {
             my $this_comment = ${ $this_warp }[3];
@@ -1573 +1574 @@
             my $this_state   = ${ $this_warp }[4];
             my $this_warp_id  = ${ $this_warp }[1];
+            
+            #find exposures for this object that have not been fully processed
             if (($this_warp_id eq 'NULL') && (($this_quality == 0) || ($this_quality eq 'NULL')) ) {
-                print STDERR "diff_queue: excluding $this_object from making diffs due to exposure $this_exp_id not being processed to warp stage\n";
-                next;
+                Nbad += 1;
             }
 
@@ -1585 +1587 @@
             }
         }
+
+        #kick object out of diff consideration if it has exposures not fully processed
+        if ($Nbad > 0) {
+            print STDERR "diff_queue: excluding $this_object from making diffs due to not being fully processed to warp stage\n";
+            next;
+        }
+
         # Exclude any warps that are not stored in the comment_hash.
         my @keep_warps = ();
@@ -1766 +1775 @@
             my %comment_hash = ();
             my %comment_hash_good = ();
+            my $Nbad = 0;
             foreach my $this_warp (@{ $warps }) {
                 my $this_comment = ${ $this_warp }[3];
@@ -1772 +1782 @@
                 my $this_state   = ${ $this_warp }[4];
                 my $this_fwhm   = ${ $this_warp }[7];
+                my $this_warp_id  = ${ $this_warp }[1];
+
+                #find exposures for this object that have not been fully processed
+                if (($this_warp_id eq 'NULL') && (($this_quality == 0) || ($this_quality eq 'NULL')) ) {
+                    Nbad += 1;
+                }
+
                 if (($this_quality != 0) || ($this_state eq 'drop') || ($this_fwhm > $maxFWHM)) {
                     print STDERR "desp_diff_singles: excluding $this_exp_id for $this_object due to non-zero cam.quality $this_quality or state $this_state or FWHM $this_fwhm\n";
@@ -1783 +1800 @@
                     $comment_hash{$this_comment} = $this_exp_id;
                 }
+            }
+
+            #kick object out of diff consideration if it has exposures not fully processed
+            if ($Nbad > 0) {
+                print STDERR "desp_diff_singles: excluding $this_object from making diffs due to not being fully processed to warp stage\n";
+                next;
             }
 
@@ -2138 +2161 @@
             my %comment_hash = ();
             my %comment_hash_good = ();
+            my $Nbad = 0;
             foreach my $this_warp (@{ $warps }) {
                 my $this_comment = ${ $this_warp }[3];
@@ -2144 +2168 @@
                 my $this_state   = ${ $this_warp }[4];
                 my $this_fwhm    = ${ $this_warp }[7];
+                my $this_warp_id  = ${ $this_warp }[1];
+
+                #find exposures for this object that have not been fully processed
+                if (($this_warp_id eq 'NULL') && (($this_quality == 0) || ($this_quality eq 'NULL')) ) {
+                    Nbad += 1;
+                }
+
                 if (($this_quality != 0) || ($this_state eq 'drop') || ($this_fwhm > $maxFWHM)) {
                     print STDERR "desp_diff_queue: excluding $this_exp_id for $this_object due to non-zero cam.quality $this_quality or state $this_state or FWHM $this_fwhm\n";
@@ -2155 +2186 @@
                     $comment_hash{$this_comment} = $this_exp_id;
                 }
+            }
+
+            #kick object out of diff consideration if it has exposures not fully processed
+            if ($Nbad > 0) {
+                print STDERR "desp_diff_queue: excluding $this_object from making diffs due to not being fully processed to warp stage\n";
+                next;
             }