Changeset 29334

Timestamp:

Oct 5, 2010, 3:45:22 PM (16 years ago)

Author:

bills

Message:

bug fixes from trunk

Location:

tags/ipp-20100823/PS-IPP-PStamp

Files:

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

tags/ipp-20100823/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -100 +100 @@
         my $x = $row->{CENTER_X};
         my $y = $row->{CENTER_Y};
-        my $results = lookup_bycoord($ipprc, $rowList, $imagedb, $img_type, $tess_id, $component, $need_magic, $x, $y, $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $verbose);
+        my $results = lookup_bycoord($ipprc, $rowList, $imagedb, $img_type, $tess_id, $component, $need_magic, $x, $y, $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $mjd_min, $mjd_max, $verbose);
         return $results;
     }
@@ -164 +164 @@
 
     my $results = lookup($ipprc, $rowList, $imagedb, $req_type, $img_type, $id, $tess_id, $component,
-        $need_magic, $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $verbose);
+        $need_magic, $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $mjd_min, $mjd_max, $verbose);
 
     return $results;
@@ -187 +187 @@
     my $data_group = shift;
     my $option_mask = shift;
+    my $mjd_min = shift;
+    my $mjd_max = shift;
     my $verbose  = shift;
 
@@ -348 +350 @@
         $command .= " -dateobs_begin $dateobs_begin" if $dateobs_begin;
         $command .= " -dateobs_end $dateobs_end" if $dateobs_end;
+    } else {
+        $command .= " -mjd_obs_begin $mjd_min" if $mjd_min;
+        $command .= " -mjd_obs_end $mjd_max" if $mjd_max;
     }
 
@@ -635 +640 @@
     my $data_group = shift;
     my $option_mask = shift;
+    my $mjd_min = shift;
+    my $mjd_max = shift;
     my $verbose    = shift;
 
@@ -650 +657 @@
                 my $these_results = lookup($ipprc, $rowList, $imagedb, "byid", $img_type, $chip->{id},
                     $tess_id, $chip->{component}, $need_magic, 
-                    $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $verbose);
+                    $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $mjd_min, $mjd_max, $verbose);
 
                 next if !$these_results;
@@ -670 +677 @@
                 my $these_results = lookup($ipprc, $rowList, $imagedb, "byskycell", $img_type, undef,
                     $skycell->{tess_id}, $skycell->{component}, $need_magic, 
-                    $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $verbose);
+                    $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $mjd_min, $mjd_max, $verbose);
 
                 next if !$these_results;
@@ -1006 +1013 @@
 
     my $ticks = ($mjd - 40587.0) * 86400;
+
+    # CONVERT from TAI to UTC
+    # XXX: do this correctly
+    if ($mjd >= 54832) {
+        $ticks += -34;
+    } else {
+        $ticks += -33;
+    }
 
     my ($sec, $min, $hr, $day, $mon, $year) = gmtime($ticks);