Changeset 16020 for trunk/ippScripts/scripts/warp_overlap.pl

Timestamp:

Jan 6, 2008, 2:00:06 PM (18 years ago)

Author:

eugene

Message:

more flexible input options for astrometry

File:

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

trunk/ippScripts/scripts/warp_overlap.pl

@@ -50 +50 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage(
-    -msg => "Required options: --warp_id --camera",
+    -msg => "Required options: --warp_id --camera --workdir",
     -exitval => 3,
 ) unless defined $warp_id
-    and defined $camera;
+    and defined $camera
+    and define $workdir;
 
 $ipprc->define_camera($camera);
@@ -125 +126 @@
         my %unique_skycells = (); # Identified skycells (all unique by virtue of hash property)
         
-        if ($astromSource and $astromSource ne 'NULL') {
-            # We have an astrometry file from psastro
+        # XXX this is a bit too hard wired: the concept is that astrometry comes from the MOSAIC vs CHIP output
+        if ($astromSource eq 'PSASTRO.OUTPUT.MEF') {
+            # We have a MEF astrometry file from psastro
             my $imfile = $imfiles->[0];
             my $camRoot = $imfile->{cam_path_base};
@@ -132 +134 @@
             
             my @matchlist = get_overlaps($astromFile, $tess_dir, $astromAccept); # List of overlaps
-            
+            if (! @matchlist) {
+                &my_die("Unable to perform dvoImageOverlaps: missing astrometry", $warp_id, $PS_EXIT_DATA_ERROR);
+            }       
             # Match each of the imfiles to this list
             foreach my $imfile (@$imfiles) {
@@ -138 +142 @@
             }
         } else {
-            # We have the imfiles themselves for the WCS
+            # We have per-imfile astrometry
             foreach my $imfile (@$imfiles) {
-                my $astromFile = $imfile->{chip_uri}; # Astrometry file
+                my $astromFile;
+                if ($astromSource eq 'PSASTRO.OUTPUT') {
+                    my $chipRoot = $imfile->{chip_path_base};
+                    my $classID = $imfile->{class_id};
+                    $astromFile = $ipprc->filename($astromSource, $chipRoot, $classID); # Astrometry file
+                } else {
+                    $astromFile = $imfile->{chip_uri}; # Astrometry file
+                }
                 my @matchlist = get_overlaps($astromFile, $tess_dir, $astromAccept); # List of overlaps
+                if (! @matchlist) {
+                    print "skipping $astromFile\n";
+                }           
+
                 extract_overlaps(\@matchlist, $imfile, $astromFile, $tess_id, \@overlaps, \%unique_skycells);
             }
@@ -222 +237 @@
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 1);
-    unless ($success) {
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform dvoImageOverlaps: $error_code", $warp_id, $error_code);
+    if (!$success) {
+        print "missing astrometry for $filename\n";
+        return 0;
     }
     return split ('\n', (join "", @$stdout_buf));