Changeset 20655

Timestamp:

Nov 10, 2008, 2:59:19 PM (17 years ago)

Author:

Paul Price

Message:

Die if the tessellation isn't specified.

File:

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

trunk/ippScripts/scripts/warp_overlap.pl

@@ -61 +61 @@
 }
 
+&my_die("Tessellation identifier not provided: $tess_dir", $warp_id, $PS_EXIT_SYS_ERROR) unless $tess_dir ne "NULL";
+
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
 
@@ -81 +83 @@
 }
 
-# Where do we get the astrometry source from? 
+# Where do we get the astrometry source from?
 my $astromSource;               # The astrometry source filerule (eg, PSASTRO.OUTPUT, PSASTRO.OUTPUT.MEF)
 my $astromAccept;               # Accept the astrometry unconditionally?
@@ -116 +118 @@
     my $astromFile = $ipprc->filename($astromSource, $camRoot); # Astrometry file
     if (!$astromFile) {
-        &my_die("Unable to determine the astrometry source", $warp_id, $PS_EXIT_DATA_ERROR);
+        &my_die("Unable to determine the astrometry source", $warp_id, $PS_EXIT_DATA_ERROR);
     }
     $astromFile = $ipprc->file_resolve($astromFile);
     if (!$astromFile) {
-        &my_die("Unable to resolve real astrometry source filename", $warp_id, $PS_EXIT_DATA_ERROR);
+        &my_die("Unable to resolve real astrometry source filename", $warp_id, $PS_EXIT_DATA_ERROR);
     }
 
     my @matchlist = get_overlaps($astromFile, $tess_dir_abs, $astromAccept); # List of overlaps
     if (! @matchlist) {
-        &my_die("Unable to perform dvoImageOverlaps: missing astrometry", $warp_id, $PS_EXIT_DATA_ERROR);
+        &my_die("Unable to perform dvoImageOverlaps: missing astrometry", $warp_id, $PS_EXIT_DATA_ERROR);
     }
     # Match each of the imfiles to this list (the input images may be split, but the astrometry is not)
     # tess_dir (not tess_dir_abs) is supplied here so it may be written to the db
     foreach my $imfile (@$imfiles) {
-        extract_overlaps(\@matchlist, $imfile, $astromFile, $tess_dir, \@overlaps, \%unique_skycells);
+        extract_overlaps(\@matchlist, $imfile, $astromFile, $tess_dir, \@overlaps, \%unique_skycells);
     }
 } else {
@@ -158 +160 @@
     print $overlapFile "  skycell_id     STR    $overlap->{skycell_id}\n";
     # XXX convert tess_id here to tess_dir when db scheme is updated
-    print $overlapFile "  tess_id        STR    $overlap->{tess_dir}\n"; 
+    print $overlapFile "  tess_id        STR    $overlap->{tess_dir}\n";
     print $overlapFile "  cam_id         S32    $overlap->{cam_id}\n";
     print $overlapFile "  class_id       STR    $overlap->{class_id}\n";
@@ -249 +251 @@
 
     if (lc($fileLevel) eq "chip") {
-        # in the case of SPLIT images, all CLASSes are included in the output list
-        # we need to pull out the single CLASS_ID for this imfile from the full list
+        # in the case of SPLIT images, all CLASSes are included in the output list
+        # we need to pull out the single CLASS_ID for this imfile from the full list
         my $class_id = $imfile->{class_id};
         my $chipRoot = $imfile->{chip_path_base};
@@ -258 +260 @@
         print STDERR "entry: $entry, class: $class_id, extname: $extname, chiproot: $chipRoot\n" if $verbose;
     } else {
-        # in the case of MEF or SINGLE images, there is only a single CLASS in the output list
+        # in the case of MEF or SINGLE images, there is only a single CLASS in the output list
         $entry = $filename;
         print STDERR "entry: $entry\n" if $verbose;