Changeset 42068

Timestamp:

Feb 24, 2022, 5:05:17 PM (4 years ago)

Author:

eugene

Message:

merge changes from trunk: handle completely failed warps using change of warpRun state (drop); move night_report to ops svn; fix logging in ipp_cleanup

Location:

branches/eam_branches/ipp-20211108/ippScripts/scripts

Files:

• ipp_cleanup.pl (modified) (1 diff)
• night_report.pl (deleted)
• nightly_science.pl (modified) (3 diffs)
• warp_overlap.pl (modified) (2 diffs, 1 prop)

branches/eam_branches/ipp-20211108/ippScripts/scripts/ipp_cleanup.pl

@@ -70 +70 @@
 }
 
-$ipprc->redirect_output($logfile) or 
+$ipprc->redirect_to_logfile($logfile) or 
         &my_die("Unable to redirect ouput", $stage, $stage_id, $PS_EXIT_UNKNOWN_ERROR) if $logfile;
 

branches/eam_branches/ipp-20211108/ippScripts/scripts/nightly_science.pl

@@ -1518 +1518 @@
             my $this_quality = ${ $this_warp }[5];
             my $this_state   = ${ $this_warp }[4];
-            if (($this_quality != 0) || ($this_state eq 'fail') ) {
+            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";
             }
@@ -1708 +1708 @@
                 my $this_quality = ${ $this_warp }[5];
                 my $this_state   = ${ $this_warp }[4];
-                if (($this_quality != 0) || ($this_state eq 'fail') ) {
+                if (($this_quality != 0) || ($this_state eq 'drop') ) {
                     print STDERR "desp_diff_singles: excluding $this_exp_id for $this_object due to non-zero cam.quality $this_quality or state $this_state\n";
                 }
@@ -1925 +1925 @@
                 my $this_quality = ${ $this_warp }[5];
                 my $this_state   = ${ $this_warp }[4];
-                if (($this_quality != 0) || ($this_state eq 'fail') ) {
+                if (($this_quality != 0) || ($this_state eq 'drop') ) {
                     print STDERR "desp_diff_queue: excluding $this_exp_id for $this_object due to non-zero cam.quality $this_quality or state $this_state\n";
                 }

branches/eam_branches/ipp-20211108/ippScripts/scripts/warp_overlap.pl

@@ -130 +130 @@
     my @matchlist = get_overlaps($astromFile, $tess_dir_abs, $astromAccept,$maxCerror); # List of overlaps
     if (! @matchlist) {
-        &my_die("Unable to perform dvoImageOverlaps: missing astrometry", $warp_id, $PS_EXIT_DATA_ERROR);
+        # OLD: &my_die("Unable to perform dvoImageOverlaps: missing astrometry", $warp_id, $PS_EXIT_DATA_ERROR);
+        warn("no overlaps found (bad astrometry); setting warpRun state to 'drop'\n");
+
+        # Add the processed file to the database
+        unless ($no_update) {
+            my $command = "$warptool -updaterun -set_state drop -warp_id $warp_id"; # Command to run warptool
+            $command .= " -dbname $dbname" if defined $dbname;
+            
+            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                run(command => $command, verbose => $verbose);
+            unless ($success) {
+                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+                warn("Unable to perform warptool -updaterun -set_state fail: $error_code\n");
+                exit($error_code);
+            }
+        }
+        exit(0);
     }
     # Match each of the imfiles to this list (the input images may be split, but the astrometry is not)
@@ -154 +170 @@
 # we set the warpRun state to 'fail' since no warpSkyCellMap can be generated.
 if (scalar @overlaps == 0) {
-    warn("no overlaps found (bad astrometry); setting warpRun state to 'fail'\n");
+    warn("no overlaps found (bad astrometry); setting warpRun state to 'drop'\n");
 
     # Add the processed file to the database
     unless ($no_update) {
-        my $command = "$warptool -updaterun -set_state fail"; # Command to run warptool
+        my $command = "$warptool -updaterun -set_state drop -warp_id $warp_id"; # Command to run warptool
         $command .= " -dbname $dbname" if defined $dbname;