Changeset 14898

Timestamp:

Sep 19, 2007, 2:04:03 PM (19 years ago)

Author:

Paul Price

Message:

Adding input source list, output source list.

Location:

trunk/ippScripts/scripts

Files:

• diff_skycell.pl (modified) (8 diffs)
• stack_skycell.pl (modified) (5 diffs)

trunk/ippScripts/scripts/diff_skycell.pl

@@ -88 +88 @@
 
 # Identify the input and the template
-my ($input, $inputMask, $inputWeight, $inputPath); # Input files and path
-my ($template, $templateMask, $templateWeight, $templatePath); # Template files and path
+my ($input, $inputMask, $inputWeight, $inputPath, $inputPSF); # Input files and path
+my ($template, $templateMask, $templateWeight, $templatePath, $templateSources); # Template files and path
 my $tess_id;                    # Tesselation identifier
 my $skycell_id;                 # Skycell identifier
@@ -100 +100 @@
             $templateMask = "PPSTACK.OUTPUT.MASK";
             $templateWeight = "PPSTACK.OUTPUT.WEIGHT";
+            $templateSources = "PPSTACK.OUTPUT.SOURCES";
         } else {
             $templateMask = "PSWARP.OUTPUT.MASK";
             $templateWeight = "PSWARP.OUTPUT.WEIGHT";
+            $templateSources = "PSWARP.OUTPUT.SOURCES";
         }
     } else {
@@ -110 +112 @@
             $inputMask = "PPSTACK.OUTPUT.MASK";
             $inputWeight = "PPSTACK.OUTPUT.WEIGHT";
+            die "ppStack doesn't output a PSF model yet.";
         } else {
             $inputMask = "PSWARP.OUTPUT.MASK";
             $inputWeight = "PSWARP.OUTPUT.WEIGHT";
+            $inputPSF = "PSPHOT.PSF.SAVE";
         }
     }
@@ -144 +148 @@
 $templateWeight = $ipprc->filename($templateWeight, $templatePath);
 $inputWeight = $ipprc->filename($inputWeight, $inputPath);
+$inputPSF = $ipprc->filename($inputPSF, $inputPath);
+$templateSources = $ipprc->filename($templateSources, $templatePath);
 
 &my_die("Couldn't find input: $template", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($template);
@@ -151 +157 @@
 &my_die("Couldn't find input: $inputMask", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inputMask);
 &my_die("Couldn't find input: $inputWeight", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inputWeight);
+&my_die("Couldn't find input: $inputPSF", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inputPSF);
+&my_die("Couldn't find input: $templateSources", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateSources);
 
 # Get the output filenames
@@ -158 +166 @@
 my $outputMask = $ipprc->filename("PPSUB.OUTPUT.MASK", $outputRoot);
 my $outputWeight = $ipprc->filename("PPSUB.OUTPUT.WEIGHT", $outputRoot);
+my $outputSources = $ipprc->filename("PSPHOT.OUTPUT", $outputRoot);
 #my $bin1Name =  $ipprc->filename("PPSUB.BIN1", $outputRoot);
 #my $bin2Name =  $ipprc->filename("PPSUB.BIN2", $outputRoot);
@@ -177 +186 @@
     $command .= " -stats $outputStats";
     $command .= " -recipe PPSTATS WARPSTATS";
+    $command .= " -sources $templateSources";
+    $command .= " -psf $inputPSF";
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -187 +198 @@
     &my_die("Couldn't find expected output file: $outputMask", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
     &my_die("Couldn't find expected output file: $outputWeight", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputWeight);
+    &my_die("Couldn't find expected output file: $outputSources", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);
 #    &my_die("Couldn't find expected output file: $bin1Name",    $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin1Name);
 #    &my_die("Couldn't find expected output file: $bin2Name",    $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin2Name);

trunk/ippScripts/scripts/stack_skycell.pl

@@ -120 +120 @@
                                       UNLINK => !$save_temps );
 my $num = 0;
+my $inputSources;               # Sources to use as stamps
 foreach my $file (@$files) {
     print $listFile "INPUT$num\tMETADATA\n";
@@ -141 +142 @@
 
     print $listFile "END\n\n";
+
+    unless (defined $inputSources) {
+        $inputSources = $ipprc->filename("PSWARP.OUTPUT.SOURCES", $file->{path_base});
+        &my_die("Source file $inputSources does not exist", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists( $inputSources );
+    }
+        
 }
 
@@ -149 +156 @@
 my $outputMask = $ipprc->filename("PPSTACK.OUTPUT.MASK", $outputRoot);
 my $outputWeight = $ipprc->filename("PPSTACK.OUTPUT.WEIGHT", $outputRoot);
+my $outputSources = $ipprc->filename("PPSTACK.OUTPUT.SOURCES", $outputRoot);
 #my $bin1Name =  $ipprc->filename("PPSTACK.BIN1", $outputRoot);
 #my $bin2Name =  $ipprc->filename("PPSTACK.BIN2", $outputRoot);
@@ -158 +166 @@
     $command .= " -stats $outputStats";
     $command .= " -recipe PPSTATS WARPSTATS";
+    $command .= " -sources $inputSources";
+    $command .= " -target 5.0";
+    $command .= " -photometry";
+
+    print "\n\nWARNING: Convolving to 1 arcsec FWHM seeing!\n\n";
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -168 +181 @@
     &my_die("Couldn't find expected output file: $outputMask", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
     &my_die("Couldn't find expected output file: $outputWeight", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputWeight);
+    &my_die("Couldn't find expected output file: $outputSources", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);
 #    &my_die("Couldn't find expected output file: $bin1Name",    $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin1Name);
 #    &my_die("Couldn't find expected output file: $bin2Name",    $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin2Name);