Changeset 26236 for branches/eam_branches/20091113/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

Timestamp:

Nov 20, 2009, 4:13:39 PM (17 years ago)

Author:

eugene

Message:

updates from head

File:

• branches/eam_branches/20091113/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (11 diffs)

branches/eam_branches/20091113/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 returned to the client for a given component is 'not destreaked'
+        # instead of 'not found'
+        $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;
@@ -237 +251 @@
     } elsif ($req_type eq "bycoord") {
         $command .= " -radius 3.0 -ra $x -decl $y";
+        if ($img_type ne "raw") {
+            $command .= " -tess_id $tess_id" if $tess_id;
+            $command .= " -skycell_id $skycell_id" if $skycell_id;
+        }
     } else {
         die "Unknown req_type supplied: $req_type";
@@ -299 +317 @@
         # (we do this here for raw stage)
         $out->{image}  = $image->{uri};
+
         if ($set_class_id) {
             $class_id = $image->{class_id};
             $out->{component} = $class_id;
+        } else {
+            $out->{component} = $image->{skycell_id};
         }
         my $stage_id;
@@ -307 +328 @@
             $stage_id = $image->{exp_id};
         } elsif ($img_type eq "chip") {
-            $stage_id = $image->{chip};
+            $stage_id = $image->{chip_id};
         } elsif ($img_type eq "warp") {
             $stage_id = $image->{warp_id};
@@ -315 +336 @@
             $stage_id = $image->{stack_id};
         }
-        $image->{stage_id} = $stage_id;
-        $image->{stage}    = $img_type;
-        $image->{image_db} = $image_db;
+        $out->{stage_id} = $stage_id;
+        $out->{stage}    = $img_type;
+        $out->{image_db} = $image_db;
 
         # find the mask and weight images
@@ -402 +423 @@
         }
 
-        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 +432 @@
             $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 +447 @@
             $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";
@@ -561 +588 @@
     }
 
-    # If there are multiple cam runs for this exposure, take the last one
-    # assuming that it has the best astrometry 
-    my $camdata = pop @$camruns;
+    # If there are multiple cam runs for this exposure, take the last completed one
+    # on the assumption that it has the best astrometry.
+    my $camdata;
+    while ($camdata = pop @$camruns) {
+        last if (($camdata->{quality} eq 0) and ($camdata->{fault} eq 0));
+    }
     if (!$camdata) {
         # no cam runs for this exposure id therefore best astrometry is whatever is in the header