Changeset 42001

Timestamp:

Jan 26, 2022, 1:26:39 PM (4 years ago)

Author:

eugene

Message:

merged fixes back from tag ipp-ps2-20210802

File:

• trunk/ippScripts/scripts/warp_overlap.pl (modified) (2 diffs, 1 prop)

trunk/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)
@@ -158 +174 @@
     # Add the processed file to the database
     unless ($no_update) {
-        my $command = "$warptool -updaterun -set_state drop"; # 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;