Changeset 26048

Timestamp:

Nov 5, 2009, 2:09:48 PM (17 years ago)

Author:

bills

Message:

fix "error" in calculation of MJD_OBS and argument to fields for getting
RA_DEG and DEC_DEG out of the stamp header

File:

• trunk/pstamp/scripts/pstamp_finish.pl (modified) (4 diffs)

trunk/pstamp/scripts/pstamp_finish.pl

@@ -208 +208 @@
 
                     # 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);
@@ -372 +377 @@
     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 +386 @@
 sub dateobs_to_mjd {
     my $dateobs = shift;
-    my $exp_time = shift;
 
     # dateobs is in format: 1970-01-01T00:00:00
@@ -391 +395 @@
     my $ticks = timegm($sec, $min, $hr, $day, $mon-1, $year-1900);
 
-    $ticks += $exp_time / 2.0;
-
     return 40587.0 + ($ticks/86400.);
 }