Changeset 14578

Timestamp:

Aug 20, 2007, 3:56:41 PM (19 years ago)

Author:

Paul Price

Message:

Adding ASTROM.ACCEPT check, which sets the -accept-astrom flag to dvoImageOverlaps.

File:

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

trunk/ippScripts/scripts/warp_overlap.pl

@@ -27 +27 @@
                        $PS_EXIT_TIMEOUT_ERROR
                        metadataLookupStr
+                       metadataLookupBool
                        caturi
                        );
@@ -87 +88 @@
 # Where do we get the astrometry source from?
 my $astromSource;               # The astrometry source
+my $astromAccept;               # Accept the astrometry unconditionally?
 {
     my $command = "$ppConfigDump -camera $camera -dump-recipe PSWARP -";
@@ -98 +100 @@
         &my_die("Unable to parse metadata config doc", $warp_id, $PS_EXIT_PROG_ERROR);
     $astromSource = metadataLookupStr($metadata, 'ASTROM.SOURCE');
+    $astromAccept = metadataLookupBool($metadata, 'ASTROM.ACCEPT');
 }
 
@@ -125 +128 @@
             my $astromFile = $ipprc->filename($astromSource, $camRoot); # Astrometry file
             
-            my @matchlist = get_overlaps($astromFile, $tess_dir, 0); # List of overlaps
+            my @matchlist = get_overlaps($astromFile, $tess_dir, $astromAccept); # List of overlaps
             
             # Match each of the imfiles to this list
@@ -135 +138 @@
             foreach my $imfile (@$imfiles) {
                 my $astromFile = $imfile->{chip_uri}; # Astrometry file
-                my @matchlist = get_overlaps($astromFile, $tess_dir, 1); # List of overlaps
+                my @matchlist = get_overlaps($astromFile, $tess_dir, $astromAccept); # List of overlaps
                 extract_overlaps(\@matchlist, $imfile, $astromFile, $tess_id, \@overlaps, \%unique_skycells);
             }
@@ -217 +220 @@
     my $filename = shift;       # Filename on which to run dvoImageOverlaps
     my $tess_dir = shift;       # Tessellation directory
-    my $flag = shift;           # Do we use the -accept-astrom flag?
+    my $accept = shift;         # Do we use the -accept-astrom flag?
 
     my $command = "$dvoImageOverlaps -D CATDIR $tess_dir " . $ipprc->file_resolve($filename);
-    $command .= ' -accept-astrom' if $flag;
+    $command .= ' -accept-astrom' if $accept;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 1);