Changeset 33514

Timestamp:

Mar 13, 2012, 3:46:07 PM (14 years ago)

Author:

bills

Message:

Add option to return uncompressed stamps and interpret pixel coordinate center
of 0,0 to mean return the entire image instead of an ROI

Location:

tags/ipp-20120216

Files:

• PS-IPP-PStamp (modified) (1 prop)
• PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm (modified) (2 diffs)
• pstamp (modified) (1 prop)
• pstamp/scripts/pstamp_job_run.pl (modified) (1 diff)
• pstamp/scripts/pstampparse.pl (modified) (3 diffs, 1 prop)
• pstamp/src (modified) (1 prop)

tags/ipp-20120216/PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm

@@ -28 +28 @@
                     $PSTAMP_SELECT_BACKMDL
                     $PSTAMP_SELECT_JPEG
+                    $PSTAMP_SELECT_UNCOMPRESSED
                     $PSTAMP_SELECT_INVERSE
                     $PSTAMP_SELECT_UNCONV
@@ -66 +67 @@
 our $PSTAMP_SELECT_BACKMDL   = 32;
 our $PSTAMP_SELECT_JPEG      = 64;
+our $PSTAMP_SELECT_UNCOMPRESSED = 512;
 our $PSTAMP_SELECT_INVERSE   = 1024;
 our $PSTAMP_SELECT_UNCONV    = 2048;

tags/ipp-20120216/pstamp/scripts/pstamp_job_run.pl

@@ -226 +226 @@
     my $command = "$ppstamp $outputBase $argString $fileArgs";
     $command .= " -write_jpeg" if ($options & $PSTAMP_SELECT_JPEG);
+    $command .= " -nocompress" if ($options & $PSTAMP_SELECT_UNCOMPRESSED);
+    $command .= " -stage $stage";
+    $command .= " -censor_masked" if $nan_masked;
     $command .= " -dbname $dbname" if $dbname;
     $command .= " -dbserver $dbserver" if $dbserver;
-    $command .= " -stage $stage";
-    $command .= " -no_censor_masked" unless $nan_masked;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);

tags/ipp-20120216/pstamp/scripts/pstampparse.pl

@@ -333 +333 @@
     my $skycenter = $row->{skycenter} = ! ($row->{COORD_MASK} & $PSTAMP_CENTER_IN_PIXELS);
 
-    if (!$skycenter and !$component) {
+    if (!$skycenter and !$component and $stage ne 'stack' and !($option_mask & $PSTAMP_USE_IMFILE_ID)){
         print STDERR "COMPONENT must be specified for pixel coordinate ROI center\n";
         insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
@@ -525 +525 @@
     my $h = $row->{HEIGHT};
     my $coord_mask = $row->{COORD_MASK};
+    my $wholeFile = 0; 
     if ($coord_mask & $PSTAMP_CENTER_IN_PIXELS) {
-        $roi_string = "-pixcenter $x $y";
+        # Center of 0, 0 in pixel coordinates is interpreted to mean
+        # return the entire file
+        if ($x == 0 && $y == 0) {
+            $roi_string = "-wholefile";
+            $wholeFile = 1;
+        } else {
+            $roi_string = "-pixcenter $x $y";
+        }
     } else {
         $roi_string = "-skycenter $x $y";
     }
-    if ($coord_mask & $PSTAMP_RANGE_IN_PIXELS) {
-        $roi_string .= " -pixrange $w $h";
-    } else {
-        $roi_string .= " -arcrange $w $h";
+    if (!$wholeFile) {
+        if ($coord_mask & $PSTAMP_RANGE_IN_PIXELS) {
+            $roi_string .= " -pixrange $w $h";
+        } else {
+            $roi_string .= " -arcrange $w $h";
+        }
     }
 
@@ -570 +580 @@
         $args .= " -class_id $component" if $component;
     }
-
-if (0) {
-    # add astrometry file for raw and chip images if one is available
-    if (($stage eq "chip") || ($stage eq "raw")) {
-        $args .= " -astrom $image->{astrom}" if $image->{astrom};
-    }
-}
 
     $image->{job_args} = $args;