Index: trunk/ippScripts/scripts/warp_overlap.pl
===================================================================
--- trunk/ippScripts/scripts/warp_overlap.pl	(revision 14571)
+++ trunk/ippScripts/scripts/warp_overlap.pl	(revision 14578)
@@ -27,4 +27,5 @@
 		       $PS_EXIT_TIMEOUT_ERROR
 		       metadataLookupStr
+		       metadataLookupBool
 		       caturi
 		       );
@@ -87,4 +88,5 @@
 # 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,4 +100,5 @@
 	&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,5 +128,5 @@
 	    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,5 +138,5 @@
 	    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,8 +220,8 @@
     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);