Changeset 27589

Timestamp:

Apr 3, 2010, 11:14:40 AM (16 years ago)

Author:

bills

Message:

Add $PSTAMP_USE_IMFILE_ID to the values processed for OPTION_MASK
This changes the ID used for byid requests from chip_id to chip_imfile_id
warp_id to warp_skyfile_id diff_id to diff_skyfile_id

Location:

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

Files:

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

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

@@ -170 +170 @@
     my $inverse = $option_mask & $PSTAMP_SELECT_INVERSE;
     my $unconvolved = $option_mask & $PSTAMP_SELECT_UNCONV;
+    my $use_imfile_id = ($req_type eq "byid") && ($option_mask & $PSTAMP_USE_IMFILE_ID);
 
     my $missing_tools;
@@ -209 +210 @@
         # are stamps of detrend exposures interesting?
         $command .= " -exp_type object";
-        $id_opt = "-exp_id";
+        $id_opt = $use_imfile_id ? "-raw_imfile_id" : "-exp_id";
         $component_args = " -class_id $class_id" if $component;
         $want_astrom = 1;
@@ -217 +218 @@
         $command = "$chiptool -processedimfile -dbname $image_db";
         $component_args = " -class_id $class_id" if $class_id;
-        $id_opt = "-chip_id";
+        $id_opt = $use_imfile_id ? "-chip_imfile_id" : "-chip_id";
         $image_name   = "PPIMAGE.CHIP";
         $mask_name    = "PPIMAGE.CHIP.MASK";
@@ -231 +232 @@
         $command = "$warptool -warped -dbname $image_db";
         $component_args = " -skycell_id $skycell_id" if $skycell_id;
-        $id_opt = "-warp_id";
+        $id_opt = $use_imfile_id ? "-warp_skyfile_id" : "-warp_id";
         $image_name   = "PSWARP.OUTPUT";
         $mask_name    = "PSWARP.OUTPUT.MASK";
@@ -242 +243 @@
         $command = "$difftool -diffskyfile -dbname $image_db";
         $component_args = " -skycell_id $skycell_id" if $skycell_id;
-        $id_opt = "-diff_id";
+        $id_opt = $use_imfile_id ? "-diff_skyfile_id" : "-diff_id";
         $image_name  = "PPSUB.OUTPUT";
         $mask_name   = "PPSUB.OUTPUT.MASK";

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

@@ -28 +28 @@
                     $PSTAMP_SELECT_INVERSE
                     $PSTAMP_SELECT_UNCONV
+                    $PSTAMP_USE_IMFILE_ID
                     $PSTAMP_WAIT_FOR_UPDATE
                     $PSTAMP_SUCCESS
@@ -59 +60 @@
 our $PSTAMP_SELECT_INVERSE   = 1024;
 our $PSTAMP_SELECT_UNCONV    = 2048;
+
+our $PSTAMP_USE_IMFILE_ID    = 16384;
 
 our $PSTAMP_WAIT_FOR_UPDATE  = 32768;