Changeset 36048

Timestamp:

Aug 27, 2013, 2:42:06 PM (13 years ago)

Author:

bills

Message:

various changes to support stack_summary pstamp jobs

Location:

trunk/pstamp/scripts

Files:

• pstamp_get_image_job.pl (modified) (3 diffs)
• pstamp_job_run.pl (modified) (6 diffs)
• pstampparse.pl (modified) (2 diffs)

trunk/pstamp/scripts/pstamp_get_image_job.pl

@@ -65 +65 @@
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
 
-my $data = $mdcParser->parse(join "", (<INPUT>)) or my_die("failed to parse metadata config doc", $PS_EXIT_UNKNOWN_ERROR);
+my $data = $mdcParser->parse(join "", (<INPUT>)) 
+    or my_die("failed to parse metadata config doc", $PS_EXIT_UNKNOWN_ERROR);
+
 my $components = parse_md_list($data);
 my $n = scalar @$components;
@@ -83 +85 @@
     print STDERR "stage_id is $stage_id\n";
     print STDERR "path_base is $path_base\n";
-    print STDERR "path_base is $path_base\n";
     print STDERR "CAMERA is $camera\n";
     print STDERR "magicked is " . (defined $magicked ? $magicked : "undefined") . "\n";
@@ -89 +90 @@
 
 if (!$camera or !$path_base or !$component or !$stage_id or !$stage) {
-       my_die("failed to parse params from: $params_file", $PS_EXIT_UNKNOWN_ERROR);
+       my_die("One or more parameters are missing in: $params_file", $PS_EXIT_UNKNOWN_ERROR);
 }
 

trunk/pstamp/scripts/pstamp_job_run.pl

@@ -562 +562 @@
 }
 
+# stack_summary stage does not currently use proper file rules.
+# The parser defers handlint this to us..
+
 sub update_stack_summary_filenames {
     my $params  = shift;
@@ -570 +573 @@
     $params->{mask}   = $path_base . ".mask.b1.fits";
     $params->{weight} = $path_base . ".variance.b1.fits";
+    $params->{jpeg}   = $path_base . ".image.0.b1.jpeg";
     $params->{exp}    = $path_base . ".exp.b1.fits";
     $params->{num}    = $path_base . ".num.b1.fits";
-
 }
 
@@ -580 +583 @@
     my $result;
     my $resolved = $ipprc->file_resolve($src);
-    if ($ipprc->file_exists($resolved)) {
+    if ($resolved and $ipprc->file_exists($resolved)) {
+        print "Copying $src to $dest\n" if $verbose;;
         $result = copy($resolved, $dest);
     } else {
@@ -602 +606 @@
     my ($outputBase, $r_options, $params) = @_;
 
+    print "Just copying files for $job_id.\n";
+
     my $options = $$r_options;
     if ($options & $PSTAMP_SELECT_IMAGE) {
@@ -616 +622 @@
         }
     }
+    if ($options & $PSTAMP_SELECT_JPEG) {
+        if (!myCopy("$outputBase.jpg", $params->{jpeg}, 'jpeg', 0)) {
+            $options &= ~$PSTAMP_SELECT_JPEG;
+        }
+    }
     if ($options & $PSTAMP_SELECT_EXP) {
         if (!myCopy("$outputBase.exp.fits", $params->{exp}, 'exp', 0)) {
@@ -628 +639 @@
 
     $$r_options = $options;
+
+    print "Done with copy.\n";
 
     return 0;

trunk/pstamp/scripts/pstampparse.pl

@@ -297 +297 @@
     }
     if ($job_type eq 'get_image') {
-        unless ($req_type eq 'byid' or $req_type eq 'byexp' or ($req_type eq 'byskycell' and $stage eq 'stack')) {
-            print STDERR "REQ_TYPE must be 'byid' or 'byexp' or byskcyell for stacks for JOB_TYPE 'get_image'\n";
+        # get_image jobs are quite expensive in terms of space so we are currently restricting them
+        unless ($req_type eq 'byid' or $req_type eq 'byexp' 
+            or ($req_type eq 'byskycell' and $stage eq 'stack')
+            or ($stage eq 'stack_summary')) {
+            print STDERR "REQ_TYPE must be 'byid' or 'byexp' JOB_TYPE 'get_image' for IMG_TYPE $stage\n";
             insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
             return 0;
@@ -306 +309 @@
     my $component = $row->{COMPONENT};
     if (!defined $component or (lc($component) eq "null") or (lc($component) eq "all")) {
-        if ($job_type eq 'get_image') {
+        if ($job_type eq 'get_image' and ! ($stage eq 'stack' or $stage eq 'stack_summary')) {
             $row->{COMPONENT} = 'all';
         } else {