Changeset 27838 for branches/tap_branches/pstamp/scripts/pstamp_finish.pl

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• pstamp/scripts/pstamp_finish.pl (modified) (11 diffs)

branches/tap_branches/pstamp/scripts/pstamp_finish.pl

@@ -63 +63 @@
 my $pstamp_results = can_run('pstamp_results_file.pl') 
                             or (warn "Can't find pstamp_results_file.pl" and $missing_tools = 1);
+my $pstampdump = can_run('pstampdump') or (warn "Can't find pstampdump" and $missing_tools = 1);
 if ($missing_tools) {
     warn("Can't find required tools.");
@@ -123 +124 @@
     my ($rlf, $reglist_name) = tempfile ("$out_dir/reglist.XXXX", UNLINK => !$save_temps);
     print $rlf "results.fits|||table|\n";
+    print $rlf "results.mdc|||text|\n";
 
     my $err_file = "parse_error.txt";
@@ -169 +171 @@
         my $exp_id = $job->{exp_id};
 
+
         if (($fault eq $PSTAMP_DUP_REQUEST) and ($req_name eq "NULL")) {
             # this request had a duplicate request name. We can't put the results
@@ -186 +189 @@
         }
 
-        if ($exp_id ne $last_exp_id) {
+        my $job_params = get_job_parameters($job);
+        my $stage = "";
+        if ($job_params) {
+            $stage = $job_params->{stage};
+        }
+
+        if ($stage ne 'stack') {
             # get the metadata for the exposure (if any i.e. stack) 
             # returns an appropriate string if !$exp_id
             $exp_info = get_exposure_info($image_db, $exp_id);
             $last_exp_id = $exp_id;
+        } else {
+            my $filter = $job_params->{filter};
+            $filter = "0" if !$filter;
+            $exp_info = "0|0|0|$filter|0|0";
+            $last_exp_id = -1;
         }
 
@@ -208 +222 @@
 
                     # ra_deg and dec_deg are the coordinates of center of the stamp
+                    # first assume that the image is compressed and check the first extension.
+                    # If not found check the PHU. If that doesn't work just set them to zero.
                     # XXX do this more cleanly
-                    my (undef, $ra_deg, $dec_deg) = split " ", `echo $out_dir/$img_name | fields -x -1 RA_DEG DEC_DEG`;
+                    my (undef, $ra_deg, $dec_deg) = split " ", `echo $out_dir/$img_name | fields -x 0 RA_DEG DEC_DEG`;
+                    if (!defined $ra_deg) {
+                        (undef, $ra_deg, $dec_deg) = split " ", `echo $out_dir/$img_name | fields RA_DEG DEC_DEG`;
+                    }
                     $ra_deg = 0.0 if (!$ra_deg);
                     $dec_deg = 0.0 if (!$dec_deg);
@@ -245 +264 @@
             print STDERR "Unable to perform $command error code: $error_code\n";
             $request_fault = $error_code >> 8;
+        } else {
+            # dump a textual representation
+            my $command = "$pstampdump $out_dir/results.fits > $out_dir/results.mdc";
+            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                run(command => $command, verbose => $verbose);
+            unless ($success) {
+                print STDERR "Unable to perform $command error code: $error_code\n";
+                $request_fault = $error_code >> 8;
+            }
         }
     }
@@ -310 +338 @@
     my $comment = $row->{COMMENT};
     $comment = "null" if !$comment;
-    my $label = $row->{LABEL};
-    $label = "null" if !$label;
+    my $data_group = $row->{DATA_GROUP};
+    if (!defined $data_group) {
+        # XXX: backwards compatibility hook. Remove "soon".
+        $data_group = $row->{LABEL};
+    }
+    $data_group = "null" if !$data_group;
 
     # This is ugly, error prone and hard to change.
     # Create a results file module and provide a list of the names (we have the data in the columns)
     my $rowinfo = "$row->{PROJECT}|$row->{JOB_TYPE}|$row->{REQ_TYPE}|$row->{IMG_TYPE}|";
-    $rowinfo   .= "$row->{ID}|$tess_id|$component|$label|$row->{OPTION_MASK}|$row->{MJD_MIN}|$row->{MJD_MAX}|";
+    $rowinfo   .= "$row->{ID}|$tess_id|$component|$data_group|$row->{OPTION_MASK}|$row->{MJD_MIN}|$row->{MJD_MAX}|";
     $rowinfo   .= "$row->{REQFILT}|$row->{COORD_MASK}|$row->{CENTER_X}|$row->{CENTER_Y}|";
     $rowinfo   .= "$row->{WIDTH}|$row->{HEIGHT}|";
@@ -322 +354 @@
 
     return ($row, $rowinfo, $row->{PROJECT});
+}
+
+sub get_job_parameters {
+    my $job = shift;
+    if (!$job->{outputBase}) {
+        print "get_job_parameters: $job->{job_id} has no outputBase\n";
+        return undef;
+    }
+    my $params_file = $job->{outputBase} . '.mdc';
+    if (! -e $params_file ) {
+        print "get_job_parameters: $job->{job_id} has no parameters file\n";
+        return undef;
+    }
+    open IN, "<$params_file" or die "unable to open $params_file";
+    my $data = join "", (<IN>);
+    close IN;
+    if (! $data ) {
+        print "get_job_parameters: parameters file is empty\n";
+        return undef;
+    }
+    my $metadata = $mdcParser->parse($data) or die("Unable to parse metdata config doc");
+
+    my $results = parse_md_list($metadata);
+    if (scalar @$results != 1) {
+        print STDERR "get_job_params: failed to parse_md_list\n";
+        return undef;
+    }
+    return $results->[0];
 }
 
@@ -372 +432 @@
     my $ra_deg   = $exp->{ra} * RADIANS_TO_DEGREES;
     my $decl_deg = $exp->{decl} * RADIANS_TO_DEGREES;
-    my $mjd_obs = dateobs_to_mjd($exp->{dateobs}, $exp->{exp_time});
+    my $mjd_obs = dateobs_to_mjd($exp->{dateobs});
 
     my $info = "$mjd_obs|$ra_deg|$decl_deg|$exp->{filter}|$exp->{exp_time}|$exp->{exp_name}";
@@ -381 +441 @@
 sub dateobs_to_mjd {
     my $dateobs = shift;
-    my $exp_time = shift;
 
     # dateobs is in format: 1970-01-01T00:00:00
@@ -391 +450 @@
     my $ticks = timegm($sec, $min, $hr, $day, $mon-1, $year-1900);
 
-    $ticks += $exp_time / 2.0;
-
     return 40587.0 + ($ticks/86400.);
 }