Changeset 27019

Timestamp:

Feb 19, 2010, 2:51:42 PM (16 years ago)

Author:

Paul Price

Message:

Don't default to the static mask.

File:

• trunk/ippScripts/scripts/warp_skycell.pl (modified) (1 diff)

trunk/ippScripts/scripts/warp_skycell.pl

@@ -153 +153 @@
     my $image = $imfile->{uri}; # Image name
     my $weight = $ipprc->filename("PPIMAGE.CHIP.VARIANCE", $imfile->{chip_path_base}, $imfile->{class_id}); # Mask name
-
     my $mask = $ipprc->filename("PSASTRO.OUTPUT.MASK", $imfile->{cam_path_base}, $imfile->{class_id}); # Mask name
-    if (!$ipprc->file_exists($mask)) {
-        print "Celestial mask $mask not found, using basic mask\n";
-        $mask = $ipprc->filename("PPIMAGE.CHIP.MASK", $imfile->{chip_path_base}, $imfile->{class_id}); # Mask name
-        &my_die("Couldn't find input file: $mask", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($mask);
-    }
 
     &my_die("Couldn't find input file: $image", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($image);
+    &my_die("Couldn't find input file: $weight", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($weight);
+    &my_die("Couldn't find input file: $mask", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($mask);
 
     # Astrometry file: astrometry is done at the camera stage, and always results in a MEF file