Changeset 36192 for branches/eam_branches/ipp-20130904/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

Timestamp:

Oct 9, 2013, 4:06:09 PM (13 years ago)

Author:

eugene

Message:

merge from trunk

File:

• branches/eam_branches/ipp-20130904/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (7 diffs)

branches/eam_branches/ipp-20130904/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -693 +693 @@
                 $out->{data_state} = $out->{state} = $out->{stack_state};
             } else {
-                # XXX: Consider looking up skycal results even if we are
+                $out->{data_state} = $out->{state};
+
+                # XXX: Consider looking up skycal and staticsky results even if we are
                 # not using releasetool
-                $out->{data_state} = $out->{state};
             }
         }
@@ -731 +732 @@
             $out->{mask}   = $ipprc->filename($mask_name,   $mask_base, $class_id) if $mask_name;
             $out->{weight} = $ipprc->filename($weight_name, $base, $class_id) if $weight_name;
-            $out->{cmf}    = $ipprc->filename($cmf_name,    $base, $class_id) if $cmf_name;
-            $out->{psf}    = $ipprc->filename($psf_name,    $base, $class_id) if $psf_name;
             $out->{backmdl}= $ipprc->filename($backmdl_name,$base, $class_id) if $backmdl_name;
+            if ($image->{staticsky_path_base}) {
+                $out->{psf}    = $ipprc->filename("PSPHOT.STACK.PSF.SAVE", $image->{staticsky_path_base}, $image->{stack_id});
+                # if astrom was not set above to the skycal cmf get the sources file from staticsky
+                $out->{cmf}    = $ipprc->filename("PSPHOT.STACK.OUTPUT",   $image->{staticsky_path_base}, $image->{stack_id}) if !$out->{astrom};
+            } else {
+                $out->{psf}    = $ipprc->filename($psf_name,    $base, $class_id) if $psf_name;
+                $out->{cmf}    = $ipprc->filename($cmf_name,    $base, $class_id) if $cmf_name;
+            }
         }
 
@@ -808 +815 @@
                         $command .= " -priority_order";
                     }
-                    $command .= " -surveyName $survey";
+                    $command .= " -surveyName $survey" if $survey;
                 } else {
                     $command = "$stacktool -dbname $imagedb";
@@ -2051 +2058 @@
     # see if we need to start the scs (skycell server)
 
+    my $very_verbose = 0;
+
     if (!$scs_tess_id or ($scs_tess_id ne $tess_id)) {
         if ($scs_tess_id) {
@@ -2076 +2085 @@
 
         # start an scs
+        print "Starting skycell server for $tess_dir_resolved.\n";
 
         # create pipes for communicating with the server
@@ -2111 +2121 @@
             my $command = "$dvoImagesAtCoords -D CATDIR $tess_dir_resolved -coords -";
 
-            print STDERR "SCS: execing $command\n";
+            print STDERR "SCS: execing $command\n" if $very_verbose;
 
             unless(exec $command) {
@@ -2146 +2156 @@
     }
 
-    my $very_verbose = 0;
     print STDERR "  sent coordinates to skycell server\n" if $very_verbose;