miriad 4.1.0.6 → 4.1.0.8

data/Rakefile

@@ -1,4 +1,4 @@
-# $Id: Rakefile 23 2008-04-30 21:42:24Z davidm $
+# $Id: Rakefile 26 2008-05-09 23:28:16Z davidm $
 
 require 'rubygems'
 require 'rake/gempackagetask'
@@ -14,7 +14,7 @@ run_swig unless test ?e, 'ext/miriad_wrap.c'
 spec = Gem::Specification.new do |s|
   # Basics
   s.name = 'miriad'
-  s.version = '4.1.0.6'
+  s.version = '4.1.0.8'
   s.summary = 'Ruby interface to MIRIAD'
   s.description = <<-EOS
     The MIRIAD-Ruby package...

data/lib/miriad.rb

@@ -7,7 +7,7 @@
 #    astronomy related methods to Ruby classes.
 #
 #--
-# $Id: miriad.rb 23 2008-04-30 21:42:24Z davidm $
+# $Id: miriad.rb 25 2008-05-09 23:12:54Z davidm $
 #++
 
 require 'rbconfig'
@@ -276,7 +276,7 @@ module Miriad
   # The version of mirlib on which this package is based.
   MIRLIB_VERSION = "4.1.0"
 
-  polarization_code_lookup_table = {
+  a_lookup_table = {
      1 => 'I' ,
      2 => 'Q' ,
      3 => 'U' ,
@@ -306,9 +306,9 @@ module Miriad
   # POLMAP is a Hash that can be used to map polarization codes to strings and
   # vice versa.
   #
-  # * Whem mapping from codes (i.e. numbers), uppercase strings are returned.
+  # * When mapping from codes (i.e. numbers), uppercase strings are returned.
   #
-  # * Whem mapping from strings, either uppercase or lowercase (but *not* mixed
+  # * When mapping from strings, either uppercase or lowercase (but *not* mixed
   #   case) can be used.
   #
   # The values follow the AIPS/FITS conventions.  Here is the mapping:
@@ -325,7 +325,7 @@ module Miriad
   # -6:: 'YY' (Linear YY)
   # -7:: 'XY' (Linear XY)
   # -8:: 'YX' (Linear YX)
-  POLMAP = polarization_code_lookup_table
+  POLMAP = a_lookup_table
 
   # call-seq: Miriad.xyz2uvw(xyz1, xyz2, obsra, obsdec, lst) -> [u, v, w]
   #
@@ -634,15 +634,15 @@ module Miriad
     end
     # call-seq: coord() -> [u, v, w]
     #
-    # Returns the [u,v,w] coordinates from this Visibility's preamble.  Note
-    # that the returned array could be an Array or an NArray, depending on how
-    # Uvio#read was called.  If you want to use multiple assignment, be sure to
-    # call +to_a+ on the returned value (otherwise your +u+ variable might end
-    # up as a three element NArray and +v+ and +w+ nil.)
-    def coord() preamble[0..2]; end
-    # Computes the uv angle (in radians) from this Visibility's preamble using
-    # <tt>atan2(v,u)</tt>.
-    def uvangle() Math.atan2(preamble[1], preamble[0]); end
+    # Returns the [u,v,w] coordinates from this Visibility's preamble.  This
+    # method always returns an Array, regardless of how
+    # Uvio#read was called.  This allows you to do multiple assignment like:
+    #
+    #   u, v, w = vis.coord
+    def coord() preamble[0..2].to_a; end
+    # Computes the uv position angle (in radians, clockwise from the v axis)
+    # from this Visibility's preamble using <tt>atan2(u,v)</tt>.
+    def uvangle() Math.atan2(preamble[0], preamble[1]); end
     # Computes the uv distance from this Visibility's preamble.
     def uvdist() Math.hypot(preamble[0], preamble[1]); end
     # Returns the Julian date from this Visibility's preamble.
@@ -754,8 +754,8 @@ module Miriad
       dlen = flen = n
       dlen *= 2 if Array === d
       # Shorten data and flags
-      d = d[0...dlen] if dlen != d.length
-      f = f[0...flen] if flen != f.length
+      vis.data  = d[0...dlen] if dlen != d.length
+      vis.flags = f[0...flen] if flen != f.length
 
       # Return Visibility
       vis
@@ -909,12 +909,12 @@ module Miriad
       getvr('lst') - getvr('obsra') rescue 0.0
     end
 
-    # Computes the uv angle (in radians) from the current value of the _coord_
-    # uv variable using <tt>atan2(v,u)</tt>.  Returns 0.0 if _coord_ is
-    # undefined or maldefined.
+    # Computes the uv position angle (in radians, clockwise from the v axis)
+    # from the current value of the _coord_ uv variable using
+    # <tt>atan2(u,v)</tt>.  Returns 0.0 if _coord_ is undefined or maldefined.
     def uvangle
       u, v, w = getvr('coord')
-      (u && v) ? Math.atan2(v, u) : 0.0
+      (u && v) ? Math.atan2(u, v) : 0.0
     end
 
     # Computes the uv distance from the current value of the _coord_ uv
@@ -938,17 +938,27 @@ module Miriad
     end
 
     # Computes the Earth rotation synthesis fringe rate in Hz using the current
-    # values of the _obsra_, _obsdec_, _lst_, _antpos_, and _baseline_ uv
-    # variables.  +freq_ghz+ is the sky frequency, in GHz, for which the fringe
-    # rate will be determined.  If it is not given, the _freq_ uv variable will
-    # be used.
+    # value of the _obsdec_ uv variable and _u_ from the _coord_ us variable.
+    #
+    # +freq_ghz+ is the sky frequency, in GHz, for which the fringe rate will
+    # be determined.  If it is not given, the value of the _freq_ uv variable
+    # will be used.
     def fringe_hz(freq_ghz = getvr('freq'))
-      bx, by, bz = baseline
-      obsra = getvr('obsra') || 0.0
+      u = getvr('coord')[0] rescue 0.0
       obsdec = getvr('obsdec') || 0.0
-      lst = getvr('lst') || 0.0
       freq_ghz ||= 0.0
-      Miriad.fringe_rate(bx, by, obsra, obsdec, lst, freq_ghz)
+      -freq_ghz * DateTime::OMEGA * u * Math.cos(obsdec)
+    end
+
+    # Computes the Earth rotation synthesis fringe period in seconds using the
+    # current value of the _obsdec_ uv variable and _u_ from the _coord_ us
+    # variable.
+    #
+    # +freq_ghz+ is the sky frequency, in GHz, for which the fringe rate will
+    # be determined.  If it is not given, the value of the _freq_ uv variable
+    # will be used.
+    def fringe_sec(freq_ghz = getvr('freq'))
+      1.0 / fringe_hz(freq_ghz)
     end
 
     # Returns <tt>getvr('inttime')</tt> or 0.0 if it is not (yet) defined.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: miriad
 version: !ruby/object:Gem::Version 
-  version: 4.1.0.6
+  version: 4.1.0.8
 platform: ruby
 authors: 
 - David MacMahon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-30 00:00:00 -07:00
+date: 2008-05-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency