miriad 4.1.0.14 → 4.1.0.16

data/ext/narray_ruby.swg

@@ -1,4 +1,4 @@
-// $Id: narray_ruby.swg 7 2008-04-18 07:21:10Z davidm $
+// $Id$
 //
 // Common setup for NArray typemaps
 //

data/lib/miriad.rb

@@ -7,7 +7,7 @@
 #    astronomy related methods to Ruby classes.
 #
 #--
-# $Id: miriad.rb 33 2009-03-17 21:30:46Z davidm $
+# $Id$
 #++
 
 require 'rbconfig'
@@ -15,7 +15,7 @@ require 'rubygems'
 require 'date'
 require 'enumerator'
 require 'narray'
-miriad_shared_lib = 'miriad.' + Config::CONFIG['DLEXT']
+miriad_shared_lib = 'miriad.' + RbConfig::CONFIG['DLEXT']
 require miriad_shared_lib
 require 'miriad_gem' if false # Fake out RDoc
 #require 'fftw3'
@@ -23,51 +23,53 @@ require 'miriad_gem' if false # Fake out RDoc
 # Add CKMS constant to Math module
 Math::const_set :CKMS, 299792.458 unless Math::const_defined? :CKMS
 
-# The MIRIAD package adds angle conversion methods to the Math module
-module Math
-  # Convert possibly non-integer degrees +fr+ to [degrees, minutes, seconds]
-  # where degrees and minutes are integers.
-  def d_to_dms(fr)
-    sign = fr <=> 0
-    fr *= sign
-    d = fr.to_i; fr %= 1; fr *= 60
-    m = fr.to_i; fr %= 1; fr *= 60
-    return d*sign, m, fr
-  end
-  module_function :d_to_dms
-
-  # Convert possibly non-integer hours +fr+ to [hours, minutes, seconds]
-  # where hours and minutes are integers.
-  def h_to_hms(fr); d_to_dms(fr); end; module_function :h_to_hms
-
-  # Convert degrees, minutes, seconds to possibly non-integer degrees.
-  # Missing arguments are assumed to be 0.
-  def dms_to_d(*args)
-    d = 0.to_r
-    d += args.shift unless args.empty?
-    sign = d < 0 ? -1 : 1
-    d += args.shift * Rational(sign,60) unless args.empty?
-    d += args.shift * Rational(sign,3600) unless args.empty?
-    return d
+# The MIRIAD package provides a Miriad::AngleConversion module
+module Miriad
+  module AngleConversion
+    # Convert possibly non-integer degrees +fr+ to [degrees, minutes, seconds]
+    # where degrees and minutes are integers.
+    def d_to_dms(fr)
+      sign = fr <=> 0
+      fr *= sign
+      d = fr.to_i; fr %= 1; fr *= 60
+      m = fr.to_i; fr %= 1; fr *= 60
+      return d*sign, m, fr
+    end
+    module_function :d_to_dms
+
+    # Convert possibly non-integer hours +fr+ to [hours, minutes, seconds]
+    # where hours and minutes are integers.
+    def h_to_hms(fr); d_to_dms(fr); end; module_function :h_to_hms
+
+    # Convert degrees, minutes, seconds to possibly non-integer degrees.
+    # Missing arguments are assumed to be 0.
+    def dms_to_d(*args)
+      d = 0.to_r
+      d += args.shift unless args.empty?
+      sign = d < 0 ? -1 : 1
+      d += args.shift * Rational(sign,60) unless args.empty?
+      d += args.shift * Rational(sign,3600) unless args.empty?
+      return d
+    end
+    module_function :dms_to_d
+
+    # Convert hours, minutes, seconds to possibly non-integer hours.
+    # Missing arguments are assumed to be 0.
+    def hms_to_h(*args); dms_to_d(*args); end
+
+    # Convert degrees to radians
+    def d2r(d) d*Math::PI/180; end; module_function :d2r
+    # Convert radians to degrees
+    def r2d(r) r*180/Math::PI; end; module_function :r2d
+    # Convert hours to radians
+    def h2r(h) h*Math::PI/12; end; module_function :h2r
+    # Convert radians to hours
+    def r2h(r) r*12/Math::PI; end; module_function :r2h
+    # Convert degrees to hours
+    def d2h(d) d/15.0; end; module_function :d2h
+    # Convert hours to degrees
+    def h2d(h) h*15.0; end; module_function :h2d
   end
-  module_function :dms_to_d
-
-  # Convert hours, minutes, seconds to possibly non-integer hours.
-  # Missing arguments are assumed to be 0.
-  def hms_to_h(*args); dms_to_d(*args); end
-
-  # Convert degrees to radians
-  def d2r(d) d*PI/180; end; module_function :d2r
-  # Convert radians to degrees
-  def r2d(r) r*180/PI; end; module_function :r2d
-  # Convert hours to radians
-  def h2r(h) h*PI/12; end; module_function :h2r
-  # Convert radians to hours
-  def r2h(r) r*12/PI; end; module_function :r2h
-  # Convert degrees to hours
-  def d2h(d) d/15.0; end; module_function :d2h
-  # Convert hours to degrees
-  def h2d(h) h*15.0; end; module_function :h2d
 end
 
 # The MIRIAD package adds angle conversion and angle formatting methods to
@@ -75,7 +77,7 @@ end
 class Numeric
   # Convert +self+ to [degrees, minutes, seconds] where degrees and minutes are
   # integers.
-  def to_dms() Math.d_to_dms(self); end
+  def to_dms() Miriad::AngleConversion.d_to_dms(self); end
   # Convert +self+ to [hours, minutes, seconds] where hours and minutes are
   # integers.
   alias :to_hms :to_dms
@@ -89,25 +91,25 @@ class Numeric
     width = prec == 0 ? 2 : prec+3
     "%02d:%02d:%0#{width}.#{prec}f" % to_dms
   end
-  # Convert +self+ from degrees to radians (i.e. <tt>Math.d2r(self)</tt>).
-  def d2r() Math.d2r(self); end
-  # Convert +self+ from radians to degrees (i.e. <tt>Math.r2d(self)</tt>).
-  def r2d() Math.r2d(self); end
-  # Convert +self+ from hours to radians (i.e. <tt>Math.h2r(self)</tt>).
-  def h2r() Math.h2r(self); end
-  # Convert +self+ from radians to hours (i.e. <tt>Math.r2h(self)</tt>).
-  def r2h() Math.r2h(self); end
-  # Convert +self+ from degrees to hours (i.e. <tt>Math.d2h(self)</tt>).
-  def d2h() Math.d2h(self); end
-  # Convert +self+ from hours to degrees (i.e. <tt>Math.h2d(self)</tt>).
-  def h2d() Math.h2d(self); end
+  # Convert +self+ from degrees to radians (i.e. <tt>Miriad::AngleConversion.d2r(self)</tt>).
+  def d2r() Miriad::AngleConversion.d2r(self); end
+  # Convert +self+ from radians to degrees (i.e. <tt>Miriad::AngleConversion.r2d(self)</tt>).
+  def r2d() Miriad::AngleConversion.r2d(self); end
+  # Convert +self+ from hours to radians (i.e. <tt>Miriad::AngleConversion.h2r(self)</tt>).
+  def h2r() Miriad::AngleConversion.h2r(self); end
+  # Convert +self+ from radians to hours (i.e. <tt>Miriad::AngleConversion.r2h(self)</tt>).
+  def r2h() Miriad::AngleConversion.r2h(self); end
+  # Convert +self+ from degrees to hours (i.e. <tt>Miriad::AngleConversion.d2h(self)</tt>).
+  def d2h() Miriad::AngleConversion.d2h(self); end
+  # Convert +self+ from hours to degrees (i.e. <tt>Miriad::AngleConversion.h2d(self)</tt>).
+  def h2d() Miriad::AngleConversion.h2d(self); end
 end
 
 # The MIRIAD package adds angle conversion methods to Array class.
 class Array
   # Convert +self+ from [degrees, minutes, seconds] to degrees.
   # Missing arguments are assumed to be 0.
-  def dms_to_d; Math::dms_to_d(*self); end
+  def dms_to_d; Miriad::AngleConversion::dms_to_d(*self); end
   # Convert +self+ from [hours, minutes, seconds] to hours.
   # Missing arguments are assumed to be 0.
   alias :hms_to_h :dms_to_d
@@ -117,7 +119,7 @@ end
 class String
   # Parse a "dd:mm:ss.sss" String to Numeric degrees.
   # <b>NOT</b> the inverse of Numeric#to_dmsstr (but may become so).
-  def dms_to_d; Math::dms_to_d(*split(':').map{|s| s.to_f}); end
+  def dms_to_d; Miriad::AngleConversion::dms_to_d(*split(':').map{|s| s.to_f}); end
   # Parse a "hh:mm:ss.sss" String to Float hours.
   alias :hms_to_h :dms_to_d
 end
@@ -127,7 +129,7 @@ end
 class DateTime
 
   # The J2000 epoch
-  J2000 = civil(2000,1,1,12)
+  J2000 = civil(2000,1,1,12) unless const_defined? :J2000
 
   # The sidereal rotation rate of Earth in radians per second
   OMEGA = 7.29211538e-5
@@ -150,10 +152,10 @@ class DateTime
   # http://www.iers.org/products/6/11136/orig/bulletina-xx-042.txt
   def ut2_ut1
     pi2t=Math::PI*2*(by%1)
-    ENV['UT2_UT1'] || 0.022 * Math::sin(pi2t) \
-    - 0.012 * Math::cos(pi2t) \
-    - 0.006 * Math::sin(2*pi2t) \
-    + 0.007 * Math::cos(2*pi2t)
+    ENV['UT2_UT1'] || 0.022 * Math.sin(pi2t) \
+    - 0.012 * Math.cos(pi2t) \
+    - 0.006 * Math.sin(2*pi2t) \
+    + 0.007 * Math.cos(2*pi2t)
   end
 
   # UT1-UTC (unit is seconds) at the time represented by +self+
@@ -965,15 +967,16 @@ module Miriad
       opts.merge!(args.pop) if Hash === args[-1]
       return nil unless ap = getvr('antpos')
       args.flatten!
-      ap = ap.enum_slice(ap.length/3).entries.transpose.unshift([0,0,0])
+      n = ap.length/3
+      ap = [ap[0*n...1*n], ap[1*n...2*n], ap[2*n...3*n]].transpose.unshift([0,0,0])
       ap = ap.values_at(*args.flatten) if args.length > 0
 
       # Do units scaling, if requested
       scale = case opts[:units]
-              when :ns: nil
-              when :meter: Math::CKMS / 1e6
-              when :lambda: getvr('freq') || 1.0
-              when :klambda: (getvr('freq') || 1.0) / 1000
+              when :ns; nil
+              when :meter; Math::CKMS / 1e6
+              when :lambda; getvr('freq') || 1.0
+              when :klambda; (getvr('freq') || 1.0) / 1000
               else raise "Unrecognized units '#{opts[:units]}'"
               end
       ap.map!{|p| p.map!{|c| c*scale}} if scale
@@ -1010,8 +1013,8 @@ module Miriad
     def baseline(*args)
       opts = (Hash === args[-1]) ? args.pop : {}
       a1, a2 = case args.length
-               when 0: basant
-               when 2: args
+               when 0; basant
+               when 2; args
                else raise ArgumentError(
                  "wrong number of arguments (#{args.length} for 0 or 2)")
                end
@@ -1194,8 +1197,8 @@ module Miriad
     #   SUPPORTED!]
     def []=(*args)
       n, t, v = case args.length
-                when 2: [args[0], -1, args[1]]
-                when 3: [args[0], args[1], args[2]]
+                when 2; [args[0], -1, args[1]]
+                when 3; [args[0], args[1], args[2]]
                 else
                   raise ArgumentError.new(
                     "wrong number of arguments (#{args.length} for 3)")

metadata

@@ -1,7 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: miriad
 version: !ruby/object:Gem::Version 
-  version: 4.1.0.14
+  hash: 39
+  prerelease: 
+  segments: 
+  - 4
+  - 1
+  - 0
+  - 16
+  version: 4.1.0.16
 platform: ruby
 authors: 
 - David MacMahon
@@ -9,20 +16,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-18 00:00:00 -07:00
-default_executable: 
+date: 2012-03-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: narray
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 5
+        - 9
         version: 0.5.9
-    version: 
-description: The MIRIAD-Ruby package...  1. Makes MIRIAD datasets accessible from Ruby by wrapping the MIRIAD UVIO routines.  2. Makes Ruby usable with MIRIAD datasets by adding convenience, utility, and astronomy related methods to Ruby classes.
+  type: :runtime
+  version_requirements: *id001
+description: "    The MIRIAD-Ruby package...\n\n    1. Makes MIRIAD datasets accessible from Ruby by wrapping\n       the MIRIAD UVIO routines.\n\n    2. Makes Ruby usable with MIRIAD datasets by adding convenience,\n       utility, and astronomy related methods to Ruby classes.\n"
 email: davidm@astro.berkeley.edu
 executables: []
 
@@ -58,8 +70,9 @@ files:
 - ext/maxdimc.h.in
 - ext/extconf.rb
 - ext/narray_ruby.swg
-has_rdoc: true
 homepage: http://miriad.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - -S
@@ -73,23 +86,31 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 63
+      segments: 
+      - 1
+      - 8
+      - 4
       version: 1.8.4
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: miriad
-rubygems_version: 1.3.1
+rubygems_version: 1.8.12
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby interface to MIRIAD
 test_files: []