Changeset 26242 for trunk/PS-IPP-PStamp

Timestamp:

Nov 21, 2009, 10:24:29 AM (17 years ago)

Author:

bills

Message:

Add interface and implemenation to allow the selection of cmf, psf, and background model
files to be added to the stamp output.
Output the parameters mdc file for stamp jobs as well as get_image jobs
use it to find "the other outputs".
Save ppstamp args in the mdc as well. This will allow the args file to be
eliminated but this commit doesn't do that.

Location:

trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp

Files:

• Job.pm (modified) (6 diffs)
• RequestFile.pm (modified) (2 diffs)

trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -166 +166 @@
     my $mask_name;
     my $weight_name;
+    my $cmf_name;
+    my $psf_name;
+    my $backmdl_name;
     my $base_name;
     my $want_astrom;
@@ -198 +201 @@
         $mask_name    = "PPIMAGE.CHIP.MASK";
         $weight_name  = "PPIMAGE.CHIP.VARIANCE";
+        $cmf_name     = "PSPHOT.OUTPUT";
+        $psf_name     = "PSPHOT.PSF.SAVE";
+        $backmdl_name = "PSPHOT.BACKMDL";
         $base_name    = "path_base"; # name of the field for the chiptool output
         $want_astrom  = 1;
@@ -209 +215 @@
         $mask_name    = "PSWARP.OUTPUT.MASK";
         $weight_name  = "PSWARP.OUTPUT.VARIANCE";
+        $cmf_name     = "PSWARP.OUTPUT.SOURCES";
+        $psf_name     = "PSPHOT.PSF.SKY.SAVE";
         $base_name    = "path_base"; # name of the field for the warptool output
     } elsif ($img_type eq "diff") {
@@ -218 +226 @@
         $mask_name   = "PPSUB.OUTPUT.MASK";
         $weight_name = "PPSUB.OUTPUT.VARIANCE";
+        $cmf_name    = "PPSUB.OUTPUT.SOURCES";
+        $psf_name     = "PSPHOT.PSF.SKY.SAVE";
         $base_name   = "path_base";
     } elsif ($img_type eq "stack") {
@@ -228 +238 @@
         $mask_name   = "PPSTACK.OUTPUT.MASK";
         $weight_name = "PPSTACK.OUTPUT.VARIANCE";
+        # this is wrong but gets the right answer. Need to figure out how to find the
+        # rule properly
+        #$cmf_name    = "PSPHOT.OUTPUT";    # this puts .fpa. in the name
+        $cmf_name     = "PSWARP.OUTPUT.SOURCES";
+        $psf_name    = "PPSTACK.TARGET.PSF";
         $base_name   = "path_base";
     } else {
@@ -340 +355 @@
         $out->{image_db} = $image_db;
 
-        # find the mask and weight images
         if ($base) {
             $out->{image}  = $ipprc->filename($image_name,  $base, $class_id) if $image_name;
             $out->{mask}   = $ipprc->filename($mask_name,   $base, $class_id) if $mask_name;
             $out->{weight} = $ipprc->filename($weight_name, $base, $class_id) if $weight_name;
+            $out->{cmf}    = $ipprc->filename($cmf_name, $base, $class_id) if $cmf_name;
+            $out->{psf}    = $ipprc->filename($psf_name, $base, $class_id) if $psf_name;
+            $out->{backmdl}= $ipprc->filename($backmdl_name, $base, $class_id) if $backmdl_name;
         }
         $out->{astrom} = find_astrometry($ipprc, $image_db, $image, $verbose) if $want_astrom;

trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm

@@ -22 +22 @@
                     $PSTAMP_SELECT_MASK
                     $PSTAMP_SELECT_WEIGHT
+                    $PSTAMP_SELECT_CMF
+                    $PSTAMP_SELECT_PSF
+                    $PSTAMP_SELECT_BACKMDL
                     $PSTAMP_SELECT_INVERSE
                     $PSTAMP_WAIT_FOR_UPDATE
@@ -48 +51 @@
 our $PSTAMP_SELECT_MASK      = 2;
 our $PSTAMP_SELECT_WEIGHT    = 4;
+our $PSTAMP_SELECT_CMF       = 8;
+our $PSTAMP_SELECT_PSF       = 16;
+our $PSTAMP_SELECT_BACKMDL   = 32;
+our $PSTAMP_SELECT_INVERSE   = 1024;
 
-our $PSTAMP_SELECT_INVERSE   = 1024;
 our $PSTAMP_WAIT_FOR_UPDATE  = 2048;