Changeset 42280 for tags/ipp-ops-20220705-ippref

Timestamp:

Sep 6, 2022, 9:10:18 AM (4 years ago)

Author:

cclin33

Message:

merging nightly_science protection changes from ipp-ops-20220705

Location:

tags/ipp-ops-20220705-ippref

Files:

• . (modified) (1 prop)
• ippScripts/scripts/nightly_science.pl (modified) (4 diffs, 1 prop)
• ippconfig/gpc2/format_20220616.config (modified) (1 prop)

tags/ipp-ops-20220705-ippref/ippScripts/scripts/nightly_science.pl

@@ -1561 +1561 @@
         $input_sth .=   " WHERE chipRun.label = '$label' AND chipRun.data_group = '$data_group' AND rawExp.filter = '$filter' AND rawExp.object = '$this_object' ";
         $input_sth .=   " AND camProcessedExp.fwhm_major <= $maxFWHM ";
-        $input_sth .=   " AND substr(rawExp.comment, 1, position(' ' in rawExp.comment)) = '$this_chunk' ORDER BY dateobs ";
+        $input_sth .=   " AND substr(rawExp.comment, 1, position(' ' in rawExp.comment)) = '$this_chunk' ORDER BY rawExp.comment,dateobs ";
 
         my $warps = $db->selectall_arrayref( $input_sth );
@@ -1572 +1572 @@
             my $this_quality = ${ $this_warp }[5];
             my $this_state   = ${ $this_warp }[4];
+            my $this_warp_id  = ${ $this_warp }[1];
+            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;
+            }
+
             if (($this_quality != 0) || ($this_state eq 'drop') ) {
                 print STDERR "diff_queue: excluding $this_exp_id for $this_object due to non-zero cam.quality $this_quality or state $this_state\n";
@@ -1752 +1758 @@
             $input_sth .=   " rawExp LEFT JOIN chipRun USING (exp_id) LEFT JOIN camRun USING (chip_id) LEFT JOIN camProcessedExp USING(cam_id) LEFT JOIN fakeRun USING (cam_id) LEFT JOIN warpRun USING (fake_id) ";
             $input_sth .=   " WHERE chipRun.label = '$label' AND chipRun.data_group = '$data_group' AND rawExp.filter = '$filter' AND rawExp.object = '$this_object' ";
-            $input_sth .=   " AND substr(rawExp.comment, 1, position(' ' in rawExp.comment)) = '$this_chunk' ORDER BY dateobs ";
+            $input_sth .=   " AND substr(rawExp.comment, 1, position(' ' in rawExp.comment)) = '$this_chunk' ORDER BY rawExp.comment,dateobs ";
 
             my $warps = $db->selectall_arrayref( $input_sth );
@@ -2124 +2130 @@
             $input_sth .=   " rawExp LEFT JOIN chipRun USING (exp_id) LEFT JOIN camRun USING (chip_id) LEFT JOIN camProcessedExp USING(cam_id) LEFT JOIN fakeRun USING (cam_id) LEFT JOIN warpRun USING (fake_id) ";
             $input_sth .=   " WHERE chipRun.label = '$label' AND chipRun.data_group = '$data_group' AND rawExp.filter = '$filter' AND rawExp.object = '$this_object' ";
-            $input_sth .=   " AND substr(rawExp.comment, 1, position(' ' in rawExp.comment)) = '$this_chunk' ORDER BY dateobs ";
+            $input_sth .=   " AND substr(rawExp.comment, 1, position(' ' in rawExp.comment)) = '$this_chunk' ORDER BY rawExp.comment,dateobs ";
 
             my $warps = $db->selectall_arrayref( $input_sth );