Changeset 25870 for branches/eam_branches/20090820/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

Timestamp:

Oct 18, 2009, 10:23:28 AM (17 years ago)

Author:

eugene

Message:

updated vysos branch from trunk

Location:

branches/eam_branches/20090820

Files:

• . (modified) (1 prop)
• PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (11 diffs)

branches/eam_branches/20090820/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -108 +108 @@
     } elsif ($req_type eq "bycoord") {
 
-        # run
-        # regtool -dbname $image_db -processedimfile -time_begin $mjd_min -time_end = $mjd_max -filter $filter
-        #
-        my $results = lookup_bycoord($ipprc, $image_db, $x, $y, $dateobs_begin, $dateobs_end, $filter, $verbose);
-
-        # now take the results and lookup byexp
-        # XXX: This needs work. What stops results from returning multiple images????
-        # We should loop over the set of images returned building up the full results array
-        $req_type = "byexp";
-        $id = $results->{exp_name};
+        if ($img_type eq "stack") {
+            print STDERR "Error bycoord lookup not implemented for stage stack yet\n";
+            return undef;
+        }
     } elsif ($req_type eq "byskycell") {
         if (($img_type eq "raw") or ($img_type eq "chip")) {
@@ -129 +123 @@
     }
 
-    my $results = lookup($ipprc, $image_db, $req_type, $img_type, $id, $tess_id, $component, $need_magic, $dateobs_begin, $dateobs_end, $filter, $label, $verbose);
+    my $results = lookup($ipprc, $image_db, $req_type, $img_type, $id, $tess_id, $component, $need_magic, $x, $y, $dateobs_begin, $dateobs_end, $filter, $label, $verbose);
 
     return $results;
 }
 
-sub lookup {
+sub lookup
+{
     my $ipprc    = shift;
     my $image_db = shift;
@@ -143 +138 @@
     my $component= shift;
     my $need_magic = shift;
+    my $x        = shift;
+    my $y        = shift;
     my $dateobs_begin = shift;
     my $dateobs_end   = shift;
@@ -175 +172 @@
 
     my $magic_arg = $need_magic ? " -destreaked" : "";
+    my $component_args;
     if ($img_type eq "raw") {
         $class_id = $component;
         $command = "$regtool -processedimfile -dbname $image_db";
+        # XXX: for now restrict lookups to type object 
+        # are stamps of detrend exposures interesting?
+        $command .= " -exp_type object";
         $id_opt = "-exp_id";
-        $command .= " -class_id $class_id" if $component;
+        $component_args = " -class_id $class_id" if $component;
         $want_astrom = 1;
         $set_class_id = 1;
@@ -185 +186 @@
         $class_id = $component;
         $command = "$chiptool -processedimfile -dbname $image_db";
-        $command .= " -class_id $class_id" if $class_id;
+        $component_args = " -class_id $class_id" if $class_id;
         $id_opt = "-chip_id";
         $image_name   = "PPIMAGE.CHIP";
@@ -196 +197 @@
         $skycell_id = $component;
         $command = "$warptool -warped -dbname $image_db";
-        $command .= " -skycell_id $skycell_id" if $skycell_id;
+        $component_args = " -skycell_id $skycell_id" if $skycell_id;
         $id_opt = "-warp_id";
         $image_name   = "PSWARP.OUTPUT";
@@ -205 +206 @@
         $skycell_id = $component;
         $command = "$difftool -diffskyfile -dbname $image_db";
-        $command .= " -skycell_id $skycell_id" if $skycell_id;
+        $component_args = " -skycell_id $skycell_id" if $skycell_id;
         $id_opt = "-diff_id";
         $image_name  = "PPSUB.OUTPUT";
@@ -212 +213 @@
         $base_name   = "path_base";
     } elsif ($img_type eq "stack") {
+        $skycell_id = $component;
         $command = "$stacktool -sumskyfile -dbname $image_db";
         $id_opt = "-stack_id";
+        $component_args = " -skycell_id $skycell_id" if $skycell_id;
 
         $image_name  = "PPSTACK.OUTPUT";
@@ -225 +228 @@
     if ($req_type eq "byid") {
         $command .= " $id_opt $id";
+        $command .= $component_args if $component_args;
     } elsif ($req_type eq "byexp") {
         $command .= " -exp_name $id";
+        $command .= $component_args if $component_args;
     } elsif ($req_type eq "byskycell") {
+        die "tess_id and component are required for byskycell" if !$tess_id or ! $skycell_id;
         $command .= " -tess_id $tess_id -skycell_id $skycell_id";
+    } elsif ($req_type eq "bycoord") {
+        $command .= " -radius 3.0 -ra $x -decl $y";
     } else {
         die "Unknown req_type supplied: $req_type";
@@ -289 +297 @@
 
         # if uri is nil this will get overridded below
-        # (this is for raw stage)
+        # (we do this here for raw stage)
         $out->{image}  = $image->{uri};
         if ($set_class_id) {
@@ -295 +303 @@
             $out->{component} = $class_id;
         }
+        my $stage_id;
+        if ($img_type eq "raw") {
+            $stage_id = $image->{exp_id};
+        } elsif ($img_type eq "chip") {
+            $stage_id = $image->{chip};
+        } elsif ($img_type eq "warp") {
+            $stage_id = $image->{warp_id};
+        } elsif ($img_type eq "diff") {
+            $stage_id = $image->{diff_id};
+        } elsif ($img_type eq "stack") {
+            $stage_id = $image->{stack_id};
+        }
+        $image->{stage_id} = $stage_id;
+        $image->{stage}    = $img_type;
+        $image->{image_db} = $image_db;
 
         # find the mask and weight images
         if ($base) {
-            $out->{image}  = $ipprc->filename($image_name,   $base, $class_id) if $image_name;
+            $out->{image}  = $ipprc->filename($image_name,  $base, $class_id) if $image_name;
             $out->{mask}   = $ipprc->filename($mask_name,   $base, $class_id) if $mask_name;
             $out->{weight} = $ipprc->filename($weight_name, $base, $class_id) if $weight_name;