Changeset 26143

Timestamp:

Nov 13, 2009, 2:48:11 PM (16 years ago)

Author:

bills

Message:

Don't add -destreaked to ippTools command if req_type is byid or byexp.
Let return them to pstampparse so that it can set the error code explicitly.

for bydiff requests do the secondary lookup for raw or chip images byid since
difftool -diffskyfile emits the appropriate values

File:

• trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (6 diffs)

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

@@ -84 +84 @@
 
         my $image = $results->[0];
-        if (($img_type eq "raw") or ($img_type eq "chip")) {
-            $req_type = "byexp";
-            $id = $image->{exp_name};
+        if ($img_type eq "raw") {
+            $req_type = "byid";
+            $id = $image->{exp_id};
             return undef if !$id;
-            # fall through and lookup byexp
+            # fall through and lookup byid
+        } elsif ($img_type eq "chip") {
+            $req_type = "byid";
+            $id = $image->{chip_id};
+            return undef if !$id;
+            # fall through and lookup byid
         } elsif ($img_type eq "warp") {
             $req_type = "byid";
@@ -171 +176 @@
     }
 
+    # note $magic_arg may be cleared below depending on $req_type
     my $magic_arg = $need_magic ? " -destreaked" : "";
+
     my $component_args;
     if ($img_type eq "raw") {
@@ -229 +236 @@
         $command .= " $id_opt $id";
         $command .= $component_args if $component_args;
+        # don't include -destreaked if lookup is byid. Let pstampparse check so that the error code gives
+        # the reason as 'not destreaked'
+        $magic_arg = "";
     } elsif ($req_type eq "byexp") {
         $command .= " -exp_name $id";
         $command .= $component_args if $component_args;
+        # don't include -destreaked if lookup is byexp. Let pstampparse check so that the error code gives
+        # the reason as 'not destreaked'
+        $magic_arg = "";
     } elsif ($req_type eq "byskycell") {
         die "tess_id and component are required for byskycell" if !$tess_id or ! $skycell_id;
@@ -402 +415 @@
         }
 
-        my ($warp_id, $exp_id, $exp_name);
+        my ($warp_id, $exp_id, $exp_name, $chip_id, $cam_id);
         if ($inverse and !$image->{bothways}) {
             print STDERR "Inverse images requested for diffRun that is not bothways. Ignoring.\n";
@@ -411 +424 @@
             $exp_id = $image->{exp_id_2};
             $exp_name = $image->{exp_name_2};
+            $chip_id = $image->{chip_id_2};
+            $cam_id = $image->{cam_id_2};
         } else {
             $warp_id =  $image->{warp1};
             $exp_id = $image->{exp_id_1};
             $exp_name = $image->{exp_name_1};
+            $chip_id = $image->{chip_id_1};
+            $cam_id = $image->{cam_id_1};
         }
         # XXX difftool currently returns max long long for null
@@ -422 +439 @@
             $image->{exp_id} = $exp_id;
             $image->{exp_name} = $exp_name;
+            $image->{chip_id} = $chip_id;
+            $image->{cam_id} = $cam_id;
         } else {
             print STDERR "unexpected result warp_id not defined\n";