miriad 4.1.0.12 → 4.1.0.14

data/Rakefile

@@ -1,4 +1,4 @@
-# $Id: Rakefile 30 2008-05-16 20:10:42Z davidm $
+# $Id: Rakefile 33 2009-03-17 21:30:46Z 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.12'
+  s.version = '4.1.0.14'
   s.summary = 'Ruby interface to MIRIAD'
   s.description = <<-EOS
     The MIRIAD-Ruby package...

data/ext/miriad_ruby.i

@@ -1,5 +1,5 @@
 /*
- * $Id: miriad_ruby.i 23 2008-04-30 21:42:24Z davidm $
+ * $Id: miriad_ruby.i 33 2009-03-17 21:30:46Z davidm $
  *
  * Ruby specific typemaps for MIRIAD Swig wrapper 
  */
@@ -7,6 +7,22 @@
 #if defined SWIGRUBY
 
 %{
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(a) (RARRAY(a)->len)
+#endif
+
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(a) (RARRAY(a)->ptr)
+#endif
+
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+
 VALUE mirlib_eWrappedMirlibError;
 %}
 
@@ -53,7 +69,7 @@ VALUE mirlib_eWrappedMirlibError;
       // Store or convert doubles to Ruby Objects
       if(TYPE(ptr[i]) == T_FLOAT) {
         // TODO Is this legit?
-        RFLOAT(ptr[i])->value = $1[i];
+        RFLOAT_VALUE(ptr[i]) = $1[i];
       } else {
         ptr[i] = rb_float_new($1[i]);
       }
@@ -99,7 +115,7 @@ VALUE mirlib_eWrappedMirlibError;
       // Store or convert doubles to Ruby Objects
       if(TYPE(ptr[i]) == T_FLOAT) {
         // TODO Is this legit?
-        RFLOAT(ptr[i])->value = $1[i];
+        RFLOAT_VALUE(ptr[i]) = $1[i];
       } else {
         ptr[i] = rb_float_new($1[i]);
       }
@@ -242,7 +258,7 @@ PUTVRX_TYPEMAP(NA_DFLOAT,double,NUM2DBL);
 // putvr typemap.
 %typemap(in) (int type) {
   if(TYPE($input) == T_STRING) {
-    $1 = (int)((RSTRING($input)->ptr)[0]);
+    $1 = (int)((RSTRING_PTR($input))[0]);
   } else {
     $1 = NUM2INT($input);
   }
@@ -288,8 +304,8 @@ PUTVRX_TYPEMAP(NA_DFLOAT,double,NUM2DBL);
           // Make sure we have a string!
           VALUE val = rb_ary_entry(vinput3,0);
           Check_Type(val, T_STRING);
-          $1 = RSTRING(val)->ptr;
-          $2 = RSTRING(val)->len;
+          $1 = RSTRING_PTR(val);
+          $2 = RSTRING_LEN(val);
         }
         break;
       default:

data/ext/miriad_wrap.c

@@ -1791,6 +1791,22 @@ typedef struct {
 } uvio;
 
 
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(a) (RARRAY(a)->len)
+#endif
+
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(a) (RARRAY(a)->ptr)
+#endif
+
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+
 VALUE mirlib_eWrappedMirlibError;
 
 
@@ -2518,7 +2534,7 @@ _wrap_Uvio_putvr(int argc, VALUE *argv, VALUE self) {
   if (argc > 2) {
     {
       if(TYPE(argv[2]) == T_STRING) {
-        arg5 = (int)((RSTRING(argv[2])->ptr)[0]);
+        arg5 = (int)((RSTRING_PTR(argv[2]))[0]);
       } else {
         arg5 = NUM2INT(argv[2]);
       }
@@ -2562,8 +2578,8 @@ _wrap_Uvio_putvr(int argc, VALUE *argv, VALUE self) {
           // Make sure we have a string!
           VALUE val = rb_ary_entry(vinput3,0);
           Check_Type(val, T_STRING);
-          arg3 = RSTRING(val)->ptr;
-          arg4 = RSTRING(val)->len;
+          arg3 = RSTRING_PTR(val);
+          arg4 = RSTRING_LEN(val);
         }
         break;
       default:
@@ -2717,7 +2733,7 @@ _wrap_Uvio_write(int argc, VALUE *argv, VALUE self) {
         // Store or convert doubles to Ruby Objects
         if(TYPE(ptr[i]) == T_FLOAT) {
           // TODO Is this legit?
-          RFLOAT(ptr[i])->value = arg2[i];
+          RFLOAT_VALUE(ptr[i]) = arg2[i];
         } else {
           ptr[i] = rb_float_new(arg2[i]);
         }
@@ -2736,7 +2752,7 @@ _wrap_Uvio_write(int argc, VALUE *argv, VALUE self) {
         // Store or convert doubles to Ruby Objects
         if(TYPE(ptr[i]) == T_FLOAT) {
           // TODO Is this legit?
-          RFLOAT(ptr[i])->value = arg3[i];
+          RFLOAT_VALUE(ptr[i]) = arg3[i];
         } else {
           ptr[i] = rb_float_new(arg3[i]);
         }
@@ -2838,7 +2854,7 @@ _wrap_Uvio_wwrite(int argc, VALUE *argv, VALUE self) {
         // Store or convert doubles to Ruby Objects
         if(TYPE(ptr[i]) == T_FLOAT) {
           // TODO Is this legit?
-          RFLOAT(ptr[i])->value = arg2[i];
+          RFLOAT_VALUE(ptr[i]) = arg2[i];
         } else {
           ptr[i] = rb_float_new(arg2[i]);
         }
@@ -3057,7 +3073,7 @@ _wrap_Uvio_uvread(int argc, VALUE *argv, VALUE self) {
         // Store or convert doubles to Ruby Objects
         if(TYPE(ptr[i]) == T_FLOAT) {
           // TODO Is this legit?
-          RFLOAT(ptr[i])->value = arg2[i];
+          RFLOAT_VALUE(ptr[i]) = arg2[i];
         } else {
           ptr[i] = rb_float_new(arg2[i]);
         }
@@ -3076,7 +3092,7 @@ _wrap_Uvio_uvread(int argc, VALUE *argv, VALUE self) {
         // Store or convert doubles to Ruby Objects
         if(TYPE(ptr[i]) == T_FLOAT) {
           // TODO Is this legit?
-          RFLOAT(ptr[i])->value = arg3[i];
+          RFLOAT_VALUE(ptr[i]) = arg3[i];
         } else {
           ptr[i] = rb_float_new(arg3[i]);
         }
@@ -3186,7 +3202,7 @@ _wrap_Uvio_uvwread(int argc, VALUE *argv, VALUE self) {
         // Store or convert doubles to Ruby Objects
         if(TYPE(ptr[i]) == T_FLOAT) {
           // TODO Is this legit?
-          RFLOAT(ptr[i])->value = arg2[i];
+          RFLOAT_VALUE(ptr[i]) = arg2[i];
         } else {
           ptr[i] = rb_float_new(arg2[i]);
         }

data/lib/miriad.rb

@@ -7,7 +7,7 @@
 #    astronomy related methods to Ruby classes.
 #
 #--
-# $Id: miriad.rb 32 2008-12-31 00:23:24Z davidm $
+# $Id: miriad.rb 33 2009-03-17 21:30:46Z davidm $
 #++
 
 require 'rbconfig'
@@ -27,45 +27,47 @@ Math::const_set :CKMS, 299792.458 unless Math::const_defined? :CKMS
 module Math
   # Convert possibly non-integer degrees +fr+ to [degrees, minutes, seconds]
   # where degrees and minutes are integers.
-  def self.d_to_dms(fr)
+  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 self.h_to_hms(fr); d_to_dms(fr); end
+  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 self.dms_to_d(*args)
+  def dms_to_d(*args)
     d = 0.to_r
     d += args.shift unless args.empty?
-    sign = d <=> 0
+    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 self.hms_to_h(*args); dms_to_d(*args); end
+  def hms_to_h(*args); dms_to_d(*args); end
 
   # Convert degrees to radians
-  def self.d2r(d) d*PI/180; end
+  def d2r(d) d*PI/180; end; module_function :d2r
   # Convert radians to degrees
-  def self.r2d(r) r*180/PI; end
+  def r2d(r) r*180/PI; end; module_function :r2d
   # Convert hours to radians
-  def self.h2r(h) h*PI/12; end
+  def h2r(h) h*PI/12; end; module_function :h2r
   # Convert radians to hours
-  def self.r2h(r) r*12/PI; end
+  def r2h(r) r*12/PI; end; module_function :r2h
   # Convert degrees to hours
-  def self.d2h(d) d/15.0; end
+  def d2h(d) d/15.0; end; module_function :d2h
   # Convert hours to degrees
-  def self.h2d(h) h*15.0; end
+  def h2d(h) h*15.0; end; module_function :h2d
 end
 
 # The MIRIAD package adds angle conversion and angle formatting methods to
@@ -329,26 +331,75 @@ module Miriad
   # -8:: 'YX' (Linear YX)
   POLMAP = a_lookup_table
 
-  # call-seq: Miriad.xyz2uvw(xyz1, xyz2, obsra, obsdec, lst) -> [u, v, w]
+  # call-seq:
+  #   Miriad.dir2hadec(obsra, obsdec, lst) -> [ha, obsdec]
+  #   Miriad.dir2hadec(obsra, obsdec, lst, <tt>:radec</tt>) -> [ha, obsdec]
+  #   Miriad.dir2hadec(az, el, latitude, <tt>:azel</tt>) -> [ha, obsdec]
+  #
+  # Compute the hour angle +ha+ and apparent declination +obsdec+ of the
+  # direction given by +obsra+ and +obsdec+ at local apparent sidereal time
+  # +lst+ or +az+ and +el+ at the given +latitude+.
+  #
+  # +obsra+, +obsdec+, +lst+  (i.e. right ascension and declination in the
+  # current epoch) at the local apparent sidereal time +lst+) if type is
+  # <tt>:radec</tt> (or not specified).
+  #
+  # +az+, +el+, +latitude+ (i.e. azimuth and elevation at latitude) if
+  # type is <tt>:azel</tt>.
+  #
+  # +obsra+, +obsdec+, +lst+, +az+, +el+, +latitude+ should be given in
+  # radians.
+  def dir2hadec(azra, eldec, latlst, type=:radec)
+    if type == :azel
+      latlst = String(ENV['LATITUDE']).dms_to_d.d2r unless latlst
+      n, e, u = azel2neu(azra, eldec) # az, el
+      x, y, z = neu2xyz(n, e, u, latlst) # n, e, u, lat
+      ha = Math.atan2(-y, x)
+      dec = Math.atan2(z, Math.hypot(x, y))
+    elsif type == :radec
+      ha = latlst - azra # lst - ra
+      dec = eldec
+    else
+      raise ArgumentError, "invalid type (#{type.inspect})"
+    end
+    [ha, dec]
+  end
+  module_function :dir2hadec
+
+  # call-seq:
+  #   Miriad.xyz2uvw(xyz1, xyz2, obsra, obsdec, lst) -> [u, v, w]
+  #   Miriad.xyz2uvw(xyz1, xyz2, obsra, obsdec, lst, <tt>:radec</tt>) -> [u, v, w]
+  #   Miriad.xyz2uvw(xyz1, xyz2, az, el, latitude, <tt>:azel</tt>) -> [u, v, w]
   #
   # Compute the [u,v,w] projection of a baseline with endpoints <tt>xyz1</tt>
-  # and <tt>xyz2</tt> in the direction of +obsra+, +obsdec+ (i.e. right
-  # ascension and declination in the current epoch) at the local apparent
-  # sidereal time +lst+.  <tt>xyz1</tt> and <tt>xyz2</tt> are three element
+  # and <tt>xyz2</tt>
+  # <tt>xyz1</tt> and <tt>xyz2</tt> are three element
   # arrays containing equitorial coordinates of the baseline endpoints, and
-  # +obsra+, +obsdec+, and +lst+ are all in radians
+  # +obsra+, +obsdec+, and +lst+ are all in radians in the direction of:
+  #
+  #
+  # +obsra+, +obsdec+, +lst+  (i.e. right ascension and declination in the
+  # current epoch) at the local apparent sidereal time +lst+) if
+  # type is <tt>:radec</tt> (or not specified).
+  #
+  # +az+, +el+, +latitude+ (i.e. azimuth and elevation at latitude) if
+  # +type+ is <tt>:azel</tt>.
+  #
+  # +obsra+, +obsdec+, +lst+, +az+, +el+, +latitude+ should be given in
+  # radians.
   #
-  # The body of this method was transcribed from the MIRIAD source file
+  # Much of the body of this method was transcribed from the MIRIAD source file
   # <tt>uvcal.for</tt>.
-  def self.xyz2uvw(xyz1,xyz2,obsra,obsdec,lst)
+  def xyz2uvw(xyz1, xyz2, azra, eldec, latlst, type=:radec)
     x1,y1,z1 = xyz1
     x2,y2,z2 = xyz2
 
-    ha = lst - obsra
+    ha, dec = dir2hadec(azra, eldec, latlst, type)
+
     sinha = Math.sin(ha)
     cosha = Math.cos(ha)
-    sind = Math.sin(obsdec)
-    cosd = Math.cos(obsdec)
+    sind = Math.sin(dec)
+    cosd = Math.cos(dec)
 
     bxx = x2 - x1
     byy = y2 - y1
@@ -360,6 +411,7 @@ module Miriad
 
     [u,v,w]
   end
+  module_function :xyz2uvw
 
   # call-seq:
   #   Miriad.neu2xyz(n, e, u, latitude) -> [x, y, z]
@@ -372,8 +424,8 @@ module Miriad
   # Output coordinates will be in the same units as the input coordinates.
   #
   # See also Miriad.xyz2neu
-  def self.neu2xyz(*args)
-    n, e, u, latitude, extra = args.flatten!
+  def neu2xyz(*args)
+    n, e, u, latitude, extra = args.flatten
     latitude ||= ENV.fetch('LATITUDE','0.0').dms_to_d.d2r
 
     sinlat = Math.sin(latitude)
@@ -384,11 +436,14 @@ module Miriad
       n * coslat + u * sinlat
     ]
   end
+  module_function :neu2xyz
 
   # :stopdoc:
+  alias :xyz2neu :neu2xyz
   class << self
     alias :xyz2neu :neu2xyz
   end
+
   # :startdoc:
   # RDoc xyz2neu as a method rather than an alias
   if false
@@ -412,9 +467,50 @@ module Miriad
       n * coslat + u * sinlat
     ]
   end
+  end # RDoc hack
+
+  # call-seq: Miriad.azel2neu(azimuth, elevation) -> [n, e, u]
+  #
+  # Compute northing +n+, easting +e+, and up +u+ from +azimuth+ and
+  # +elevation+ at a unit distance (i.e. the length of the returned [n, e, u]
+  # vector will be 1).  +azimuth+ and +elevation+ should be in radians.
+  def azel2neu(az, el)
+    cosel = Math.cos(el)
+    n = cosel*Math.cos(az)
+    e = cosel*Math.sin(az)
+    u = Math.sin(el)
+    [n, e, u]
+  end
+  module_function :azel2neu
+
+  # call-seq: Miriad.neu2azel(n, e, u) -> [azimuth, elevation]
+  #
+  # Compute the +azimuth+ and +elevation+ for the given northing +n+, easting
+  # +e+, and up +u+.  The returned +azimuth+ and +elevation+ will be in
+  # radians.
+  def neu2azel(n, e, u)
+    az = Math.atan2(e,n)
+    ne = Math.hypot(n,e)
+    el = Math.atan2(u,ne)
+    [az, el]
   end
+  module_function :neu2azel
 
-  # call-seq: Miriad.azel(obsra, obsdec, lst, latitude) -> [azimuth, elevation]
+  # call-seq:
+  #   Miriad.azeldelay(+neu+, +az+, +el+) -> +delay+
+  #   Miriad.azeldelay(+n+, +e+, +u+, +az+, +el+) -> +delay+
+  #
+  # Computes the delay in the direction given by +az+ and +el+ seen by a
+  # baseline given in N, E, U topocentric coordinates (either as a three
+  # element +neu+ array or as individual parameters).
+  def azeldelay(*args)
+    bn, be, bu, az, el = args.flatten
+    sn, se, su = azel2neu(az, el)
+    bn*sn + be*se + bu*su
+  end
+  module_function :azeldelay
+
+  # call-seq: Miriad.radec2azel(obsra, obsdec, lst, latitude) -> [azimuth, elevation]
   #
   # Compute +azimuth+ and +elevation+ from +obsra+, +obsdec+, +lst+,
   # +latitude+.
@@ -439,7 +535,7 @@ module Miriad
   #
   # The body of this method was transcribed from the miriad source file
   # <tt>ephem.for</tt> originally created by Bob Sault.
-  def self.azel(obsra, obsdec, lst, latitude=String(ENV['LATITUDE']).dms_to_d.d2r)
+  def radec2azel(obsra, obsdec, lst, latitude=String(ENV['LATITUDE']).dms_to_d.d2r)
     ha = lst - obsra
     cosha = Math.cos(ha)
     sinha = Math.sin(ha)
@@ -454,26 +550,71 @@ module Miriad
 
     [az, el]
   end
+  module_function :radec2azel
+
+  alias :azel :radec2azel
+  class << self
+    alias :azel :radec2azel
+  end
+
+  # call-seq: Miriad.azel2radec(azimuth, elevation, lst, latitude) -> [ra, dec]
+  #
+  # Compute the apparent +ra+ and +dec+ (in current epoch) from +azimuth+,
+  # +elevation+, +lst+, and +latitude+.
+  #
+  # NOTE: This calculation is based on a spherical model for the earth, and
+  # does not include any atmospheric effects (e.g. refraction).
+  #
+  # Input:
+  #
+  # +azimuth+::   Azimuth from north (radians).
+  # +elevation+:: Elevation from horizon (radians).
+  # +lst+::       Local sidereal time (radians).
+  # +latitude+::  Observatory geodetic latitude (radians).  If not given, the
+  #               value from <tt>ENV['LATITUDE']</tt> (which should be in
+  #               degrees in <tt>dd:mm:ss.sss</tt> or <tt>dd.ddd</tt> format)
+  #               will be used.
+  #
+  # Output:
+  #
+  # +ra+::    Apparent RA of the source of interest (radians).
+  # +dec+::   Apparent DEC of the source of interest (radians).
+  def azel2radec(az, el, lst, latitude=String(ENV['LATITUDE']).dms_to_d.d2r)
+    x, y, z = Miriad.neu2xyz(azel2neu(az, el), latitude)
+    ha = Math.atan2(-y, x)
+    ra = (lst - ha) % (2*Math::PI)
+    dec = Math.atan2(z, Math.hypot(x, y))
+    [ra, dec]
+  end
+  module_function :azel2radec
 
-  # call-seq: Miriad.fringe_rate(bx, by, obsra, obsdec, lst, freq)
+  # call-seq:
+  #   Miriad.fringe_rate(bx, by, freq, obsra, obsdec, lst)
+  #   Miriad.fringe_rate(bx, by, freq, obsra, obsdec, lst, <tt>:radec</tt>)
+  #   Miriad.fringe_rate(bx, by, freq, az, el, latitude, <tt>:azel</tt>)
+  #
+  # Computes the Earth rotation synthesis fringe rate at sky frequency +freq+
+  # for a source in the direction given by either +obsra+ and +obsdec+ at local
+  # sidereal time +lst+ or +az+ and +el+ at +latitude+ as seen by a baseline
+  # with X and Y equitorial components +bx+ and +by+.
   #
-  # Computes the Earth rotation synthesis fringe rate for a source at +obsra+
-  # and +obsdec+ at local sidereal time +lst+ and sky frequency +freq+ as seen
-  # by a baseline with X and Y equitorial components +bx+ and +by+.
+  # +obsra+, +obsdec+, +lst+, +az+, +el+, +latitude+ should be given in
+  # radians.
   #
   # The units of the result depends on the the units of the inputs.  To get
   # turns per second (i.e. Hz), +bx+ and +by+ should be in nanoseconds and
   # +freq+ should be in GHz (alternatively, +bx+ and +by+ in seconds and +freq+
   # in Hz).  To get radians per second, multiply +freq+ by 2*Math::PI.  To get
   # degrees per second, multiply +freq+ by 360.
-  def self.fringe_rate(bx, by, obsra, obsdec, lst, freq)
-    ha = lst - obsra
+  def fringe_rate(bx, by, freq, azra, eldec, latlst, type=:radec)
+    ha, obsdec = dir2hadec(azra, eldec, latlst, type)
     cosha = Math.cos(ha)
     sinha = Math.sin(ha)
     cosd = Math.cos(obsdec)
 
     -freq * DateTime::OMEGA * (bx*sinha + by*cosha) * cosd
   end
+  module_function :fringe_rate
 
   # call-seq: Miriad.parang(obsra, obsdec, lst, latitude) -> parallactic_angle
   #
@@ -496,13 +637,14 @@ module Miriad
   #
   # The body of this method was transcribed from the miriad source file
   # <tt>ephem.for</tt> originally created by Bob Sault.
-  def self.parang(obsra, obsdec, lst, latitude=String(ENV['LATITUDE']).dms_to_d.d2r)
+  def parang(obsra, obsdec, lst, latitude=String(ENV['LATITUDE']).dms_to_d.d2r)
     ha = lst - obsra
     sinq = Math.cos(latitude) * Math.sin(ha)
     cosq = Math.sin(latitude) * Math.cos(obsdec) -
            Math.cos(latitude) * Math.sin(obsdec) * Math.cos(ha)
     Math.atan2(sinq, cosq)
   end
+  module_function :parang
 
   # call-seq: Miriad.precess(ra, dec, to_jd, from_jd) -> [ra, dec]
   #
@@ -532,7 +674,7 @@ module Miriad
   #
   # The body of this method was transcribed from the miriad source file
   # <tt>ephem.for</tt> originally created by Bob Sault.
-  def self.precess(ra, dec, to_jd=DateTime.now.ajd, from_jd=DateTime::J2000.ajd)
+  def precess(ra, dec, to_jd=DateTime.now.ajd, from_jd=DateTime::J2000.ajd)
     t = (from_jd - 2451545)/36525
     m = Math::PI/180 * (1.2812323 + (0.0003879 + 0.0000101*t)*t)*t
     n = Math::PI/180 * (0.5567530 - (0.0001185 + 0.0000116*t)*t)*t
@@ -557,46 +699,51 @@ module Miriad
 
     [ra, dec]
   end
+  module_function :precess
 
   # call-seq: Miriad.basstr(baseline, format='%d-%d') -> "A1-A2"
   #
   # Format a MIRIAD baseline number as a String according to +format+.
-  def self.basstr(baseline, format='%d-%d')
+  def basstr(baseline, format='%d-%d')
     baseline = baseline.to_i
     format % basant(baseline)
   end
+  module_function :basstr
 
   # call-seq: Miriad.basant(baseline) -> [a1, a2]
   #
   # Convert a MIRIAD baseline number into two antenna numbers.
-  def self.basant(baseline)
+  def basant(baseline)
     baseline = baseline.to_i
     [baseline/256, baseline%256]
   end
+  module_function :basant
 
   # call-seq: Miriad.antbas(a1, a2) -> baseline_number
   #
   # Convert two antenna numbers into a MIRIAD baseline number
-  def self.antbas(a1,a2)
+  def antbas(a1,a2)
     a1, a2 = a2, a1 if a2 < a1
     a1.to_i*256 + a2.to_i
   end
+  module_function :antbas
 
   # call-seq: Miriad.basidx(a1, a2, n) -> baseline_index
   #
   # Convert two antenna numbers, <tt>a1</tt> and <tt>a2</tt>, into a baseline
   # index (NOT a MIRIAD baseline number) using +n+ as the maximum antenna
   # number.
-  def self.basidx(a1,a2,n)
+  def basidx(a1,a2,n)
     a1, a2 = a2, a1 if a2 < a1
     return a1 + ((2*n+1)*(a2-a1) - (a2-a1)**2) / 2
   end
+  module_function :basidx
 
   # call-seq: Miriad.idxbas(baseline_index, n) -> [a1, a2]
   #
   # Convert a baseline index (NOT a MIRIAD baseline number) +i+ into two
   # antenna numbers using +n+ as the maximum antenna number.
-  def self.idxbas(i,n)
+  def idxbas(i,n)
     b = -(2*n+1)
     ac = 2*i
     r = Math.sqrt(b**2-4*ac)
@@ -605,6 +752,7 @@ module Miriad
     a2 = a1 + d
     [a1, a2]
   end
+  module_function :idxbas
 
   # The Visibility class holds preamble, visdata, and flags for one integration
   # on one baseline.  It also provides convenience methods to query and access
@@ -893,7 +1041,7 @@ module Miriad
     # Format the current value of the _baseline_ uv variable as a String
     # according to +format+.
     def basstr(format='%d-%d')
-      format % basant(getvr('baseline'))
+      format % basant
     end
 
     # call-seq: basant -> [ant1, ant2]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: miriad
 version: !ruby/object:Gem::Version 
-  version: 4.1.0.12
+  version: 4.1.0.14
 platform: ruby
 authors: 
 - David MacMahon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-30 00:00:00 -08:00
+date: 2009-03-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency