Changeset 25022 for branches/eam_branches/20090715/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

Timestamp:

Aug 7, 2009, 12:45:24 PM (17 years ago)

Author:

eugene

Message:

update from mainline

Location:

branches/eam_branches/20090715

Files:

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

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

@@ -24 +24 @@
 use PS::IPP::Metadata::List qw( parse_md_list );
 use PS::IPP::Config qw( :standard );
+use Carp;
 
 ### my @images = locate_images($image_db, $req_type, $img_type, $id, $component,
@@ -121 +122 @@
     my $command;
     my $id_opt;     # option for the lookup
+    my $image_name;
     my $mask_name;
     my $weight_name;
@@ -130 +132 @@
 
     # special class_id value "null" means ignore
-    if ($component eq "null") {
+    if ($component and ($component eq "null")) {
         $component = undef;
     }
@@ -146 +148 @@
         $command .= " -class_id $class_id" if $class_id;
         $id_opt = "-chip_id";
+        $image_name   = "PPIMAGE.CHIP";
         $mask_name    = "PPIMAGE.CHIP.MASK";
         $weight_name  = "PPIMAGE.CHIP.VARIANCE";
@@ -156 +159 @@
         $command .= " -skycell_id $skycell_id" if $skycell_id;
         $id_opt = "-warp_id";
+        $image_name   = "PSWARP.OUTPUT";
         $mask_name    = "PSWARP.OUTPUT.MASK";
         $weight_name  = "PSWARP.OUTPUT.VARIANCE";
@@ -164 +168 @@
         $command .= " -skycell_id $skycell_id" if $skycell_id;
         $id_opt = "-diff_id";
+        $image_name  = "PPSUB.OUTPUT";
         $mask_name   = "PPSUB.OUTPUT.MASK";
         $weight_name = "PPSUB.OUTPUT.VARIANCE";
@@ -171 +176 @@
         $id_opt = "-stack_id";
 
+        $image_name  = "PPSTACK.OUTPUT";
         $mask_name   = "PPSTACK.OUTPUT.MASK";
         $weight_name = "PPSTACK.OUTPUT.VARIANCE";
@@ -210 +216 @@
         my $base;
 
-        next if ($img_type eq "warp" and $image->{ignored});
+        next if $image->{fault};
+        next if ($img_type ne "raw") and $image->{quality};
 
         if ($base_name) {
@@ -224 +231 @@
             $ipprc->define_camera($camera);
         }
-        my $out = {};
-        $out->{exp_id} = $image->{exp_id};
-        $out->{exp_name} = $image->{exp_name};
+        my $out = $image;
+
+        # if uri is nil this will get overridded below
+        # (this is for raw stage)
         $out->{image}  = $image->{uri};
-        $out->{state}  = $image->{state}; # state is undef for rawExp, but that's ok
         if ($set_class_id) {
             $class_id = $image->{class_id};
-            $out->{class_id} = $class_id;
+            $out->{component} = $class_id;
         }
 
         # find the mask and weight images
         if ($base) {
+            $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;
         }
-        $out->{camera} = $camera;
-
         $out->{astrom} = find_astrometry($ipprc, $image_db, $image, $verbose) if $want_astrom;
 
@@ -432 +438 @@
 }
 
+# cache of results of ppConfigDump
+my %astromSources;
+my $last_exp_id = 0;
+my $lastAstromFile;
+
 # find the astrometry file for a given exposure
 # return undef if no completed camRun exists
@@ -440 +451 @@
     my $verbose = shift;
 
+    my $exp_id = $image->{exp_id};
+    if (($exp_id eq $last_exp_id) and $lastAstromFile) {
+        # running camtool 60 times is really expensive when the answer is the same
+        return $lastAstromFile;
+    }
+    $last_exp_id = 0;
+    $lastAstromFile = undef;
+
     my $missing_tools;
     my $camtool = can_run("camtool") or (warn "Can't find camtool" and $missing_tools = 1);
@@ -448 +467 @@
     }
 
-    my $command = "$camtool -dbname $image_db -processedexp -exp_id $image->{exp_id}";
+    my $command = "$camtool -dbname $image_db -processedexp -exp_id $exp_id";
     # run the tool and parse the output
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -478 +497 @@
     my $camRoot = $camdata->{path_base};
     my $camera = $image->{camera};
-    my $astromSource;
-    {
+    my $astromSource = $astromSources{$camera};
+    if (!$astromSource) {
        my $command = "$ppConfigDump -camera $camera -dump-recipe PSWARP -";
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -490 +509 @@
             die("Unable to parse metadata config doc");
         $astromSource = metadataLookupStr($metadata, 'ASTROM.SOURCE');
+        $astromSources{$camera} = $astromSource;
     }
 
     my $astromFile = $ipprc->filename($astromSource, $camRoot);
+    if ($astromFile) {
+        $lastAstromFile = $astromFile;
+        $last_exp_id = $exp_id;
+    }
 
     return $astromFile;
@@ -538 +562 @@
 # resolve_project()
 # get project specific information
+my $last_project = "";
 sub resolve_project {
     my $ipprc = shift;
     my $project_name = shift;
+
+    if (!$project_name) {
+        carp ("project is not defined");
+        return undef;
+    }
+
+    if ($project_name eq $last_project) {
+        return $last_project;
+    }
+
     my $dbname = shift;
-    die "project is not defined" if !$project_name;
+    my $dbserver = shift;
 
     my $verbose = 0;
@@ -555 +590 @@
     my $command = "$pstamptool -project -name $project_name";
     $command .= " -dbname $dbname" if defined $dbname;
+    $command .= " -dbserver $dbserver" if defined $dbserver;
     # run the tool and parse the output
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -572 +608 @@
     my $proj_hash = parse_md_fast($mdcParser, $output);
 
-    return $proj_hash->[0];
+    $last_project = $proj_hash->[0];
+
+    return $last_project;
 }
 1;