Changeset 41653

Timestamp:

Jun 8, 2021, 3:36:24 PM (5 years ago)

Author:

eugene

Message:

merge changes from tags/ipp-ps1-20210510: strip nebpath from file in warp_overlap.pl

File:

• trunk/ippScripts/scripts/warp_overlap.pl (modified) (3 diffs)

trunk/ippScripts/scripts/warp_overlap.pl

@@ -125 +125 @@
     }
 
-    my @matchlist = get_overlaps($astromFile, $tess_dir_abs, $astromAccept); # List of overlaps
+    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);
@@ -212 +212 @@
 
     my $command = "$dvoImageOverlaps -D CATDIR $tess_dir_abs " . $filename;
-    $command .= ' -accept-astrom' if $accept;
-    $command .= ' -D OVERLAPS_MAX_CERROR $maxCerror'; # skip poorly calibrated images from warps
+    $command .= " -accept-astrom" if $accept;
+    $command .= " -D OVERLAPS_MAX_CERROR $maxCerror"; # skip poorly calibrated images from warps
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);
@@ -248 +248 @@
     # Get rid of the path
     my @dirlist = File::Spec->splitdir( $filename ); # The elements of the full path
-    $filename = pop @dirlist;
+    my $filenamecut = pop @dirlist;
+    my @splitlist = split /:/, $filenamecut;
+    $filename = pop @splitlist;
 
     # Work out how to identify this imfile in the output