Changeset 33381

Timestamp:

Feb 28, 2012, 1:44:09 PM (14 years ago)

Author:

bills

Message:

Add option to create a JPEG image of the stamp

Location:

trunk

Files:

• PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm (modified) (2 diffs)
• pstamp/scripts/pstamp_job_run.pl (modified) (2 diffs)

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

@@ -27 +27 @@
                     $PSTAMP_SELECT_PSF
                     $PSTAMP_SELECT_BACKMDL
+                    $PSTAMP_SELECT_JPEG
                     $PSTAMP_SELECT_INVERSE
                     $PSTAMP_SELECT_UNCONV
@@ -64 +65 @@
 our $PSTAMP_SELECT_PSF       = 16;
 our $PSTAMP_SELECT_BACKMDL   = 32;
+our $PSTAMP_SELECT_JPEG      = 64;
 our $PSTAMP_SELECT_INVERSE   = 1024;
 our $PSTAMP_SELECT_UNCONV    = 2048;

trunk/pstamp/scripts/pstamp_job_run.pl

@@ -225 +225 @@
 
     my $command = "$ppstamp $outputBase $argString $fileArgs";
+    $command .= " -write_jpeg" if ($options & $PSTAMP_SELECT_JPEG);
     $command .= " -dbname $dbname" if $dbname;
     $command .= " -dbserver $dbserver" if $dbserver;
@@ -249 +250 @@
 
         # Note: we are assuming the contents of the PSTAMP filerules here.
-        my %extensions = ( $PSTAMP_SELECT_IMAGE  => "fits", 
-                           $PSTAMP_SELECT_MASK   => "mk.fits",
-                           $PSTAMP_SELECT_VARIANCE => "wt.fits");
-
-        my $output_mask = $options & ($PSTAMP_SELECT_IMAGE | $PSTAMP_SELECT_MASK | $PSTAMP_SELECT_VARIANCE);
+        my %extensions = ( $PSTAMP_SELECT_IMAGE    => "fits", 
+                           $PSTAMP_SELECT_MASK     => "mk.fits",
+                           $PSTAMP_SELECT_VARIANCE => "wt.fits",
+                           $PSTAMP_SELECT_JPEG     => "jpg");
+
+        my $output_mask = $options & ($PSTAMP_SELECT_IMAGE | $PSTAMP_SELECT_MASK | $PSTAMP_SELECT_VARIANCE | $PSTAMP_SELECT_JPEG);
 
         foreach my $key (keys (%extensions)) {