Changeset 21371 for trunk/ippScripts/scripts/warp_skycell.pl

Timestamp:

Feb 5, 2009, 5:15:21 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. No conflicts. Not tested.

File:

• trunk/ippScripts/scripts/warp_skycell.pl (modified) (3 diffs)

trunk/ippScripts/scripts/warp_skycell.pl

@@ -114 +114 @@
 my $outputImage = $ipprc->filename("PSWARP.OUTPUT", $outroot, $skycell_id );
 my $outputMask = $ipprc->filename("PSWARP.OUTPUT.MASK", $outroot, $skycell_id);
-my $outputWeight = $ipprc->filename("PSWARP.OUTPUT.WEIGHT", $outroot, $skycell_id);
+my $outputWeight = $ipprc->filename("PSWARP.OUTPUT.VARIANCE", $outroot, $skycell_id);
 my $outputSources = $ipprc->filename("PSWARP.OUTPUT.SOURCES", $outroot, $skycell_id);
 my $outputPSF = $ipprc->filename("PSPHOT.PSF.SKY.SAVE", $outroot);
@@ -142 +142 @@
 foreach my $imfile (@$imfiles) {
     my $image = $imfile->{uri}; # Image name
-    my $weight = $ipprc->filename("PPIMAGE.CHIP.WEIGHT", $imfile->{chip_path_base}, $imfile->{class_id}); # Mask 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);
+        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);
     }
 
@@ -182 +182 @@
     $command .= " -list $imageName";
     $command .= " -masklist $maskName";
-    $command .= " -weightlist $weightName";
+    $command .= " -variancelist $weightName";
     $command .= " -astromlist $astromName";
     $command .= " $outroot $skyFile";