miriad 4.1.0.2 → 4.1.0.4

data/Rakefile

@@ -1,4 +1,4 @@
-# $Id: Rakefile 10 2008-04-21 19:51:41Z davidm $
+# $Id: Rakefile 18 2008-04-23 17:31:29Z 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.2'
+  s.version = '4.1.0.4'
   s.summary = 'Ruby interface to MIRIAD'
   s.description = <<-EOS
     The MIRIAD-Ruby package...

data/ext/miriad_ruby.c

@@ -1,5 +1,5 @@
 /*
- * $Id: miriad_ruby.c 16 2008-04-22 05:40:33Z davidm $
+ * $Id: miriad_ruby.c 18 2008-04-23 17:31:29Z davidm $
  *
  * This file is just to document the classes/methods from the SWIG wrappers
  * that we want to document.  It is for rdoc, not gcc.  At least for now.
@@ -322,10 +322,7 @@ static VALUE uvio_set;
  *   preamble will populate _w_ with 0.0 if the dataset was written with only a
  *   4 element preamble.
  *
- *   * If a Fixnum is passed in as +preamble+, an NArray that long of type
- *     NArray::DFLOAT is created and returned with the preamble data.
- *
- *   * Otherwise +preamble+ must be passed in as an Array or NArray (of type
+ *   * +preamble+ must be passed in as an Array or NArray (of type
  *     NArray::DFLOAT) of suitable length (i.e.  either 4 or 5).  Its contents
  *     will be overwritten with new premable data.
  *
@@ -333,19 +330,14 @@ static VALUE uvio_set;
  *
  *   The complex valued correlation data are returned in +data+.
  *
- *   * If a Fixnum or Bignum is passed in as +data+, an NArray that long of
- *     type NArray::SCOMPLEX is created, populated with +nread+ complex data
- *     values, and returned.
- *
- *   * Otherwise, +data+ must be passed in as an Array or Narray (of type
+ *   * +data+ must be passed in as an Array or Narray (of type
  *     NArray::SCOMPLEX).  Its contents will be overwritten with +nread+ data
  *     values.  Note that an Array will be filled with real and imaginary
  *     components in consecutive elements and must therefore contain twice as
  *     many elements as the number of complex valued data points.  In general,
  *     NArray +data+ will be preferred.
  *
- *   * In either of the above cases, the number of complex valued data points
- *     (either +data+ or <tt>data.length</tt>) must be the same as the number
+ *   * The number of complex valued data points must be the same as the number
  *     of flag values, otherwise an exception will be raised.  Note that the
  *     length of an Array is twice the number of complex valued data points
  *     that will fit in it.
@@ -355,16 +347,11 @@ static VALUE uvio_set;
  *   The +flags+ indicate whether the corresponding data value has been deemed
  *   good or bad.  A <tt>1</tt> means good; a <tt>0</tt> means bad.
  *
- *   * If a Fixnum or Bignum is passed in as +flags+, an NArray that long of
- *     type NArray::LINT is created, populated with +nread+ flag values, and
- *     returned.
- *
- *   * Otherwise, +flags+ must be passed in as an Array or Narray (of type
+ *   * +flags+ must be passed in as an Array or Narray (of type
  *     NArray::LINT).  Its contents will be overwritten with +nread+ flag
  *     values.
  *
- *   * In either of the above cases, the number of complex valued data points
- *     (either +data+ or <tt>data.length</tt>) must be the same as the number
+ *   * The number of complex valued data points must be the same as the number
  *     of flag values, otherwise an exception will be raised.
  *
  * * +nread+

data/ext/miriad_ruby.i

@@ -1,5 +1,5 @@
 /*
- * $Id: miriad_ruby.i 15 2008-04-22 05:26:51Z davidm $
+ * $Id: miriad_ruby.i 18 2008-04-23 17:31:29Z davidm $
  *
  * Ruby specific typemaps for MIRIAD Swig wrapper 
  */
@@ -20,14 +20,6 @@ VALUE mirlib_eWrappedMirlibError;
 
 // Typemaps for preamble
 %typemap(in) (double *preamble) {
-  // If FIXNUM allocate NA_DFLOAT array that many
-  // This only makes sense for reads (or writing zeros)
-  if(TYPE($input) == T_FIXNUM) {
-    int rank = 1;
-    int shape = FIX2INT($input);
-    VALUE naclass = rb_const_get(rb_cObject,rb_intern("NArray"));
-    $input = na_make_object(NA_DFLOAT,rank,&shape,naclass);
-  }
   // If NArray
   if(NA_IsNArray($input)) {
     Check_NArrayType($input,NA_DFLOAT);
@@ -74,15 +66,6 @@ VALUE mirlib_eWrappedMirlibError;
 // Length of complex data must be twice the length of flags
 %typemap(in) (float * data) (int ndata) {
   int i;
-  // If FIXNUM or BIGNUM, allocate NA_SCOMPLEX array that many
-  // This only makes sense for reads (or writing zeros)
-  if(TYPE($input) == T_FIXNUM || TYPE($input) == T_BIGNUM) {
-    ndata = NUM2INT($input);
-    int rank = 1;
-    int shape = ndata;
-    VALUE naclass = rb_const_get(rb_cObject,rb_intern("NArray"));
-    $input = na_make_object(NA_SCOMPLEX,rank,&shape,naclass);
-  }
   // If NArray
   if(NA_IsNArray($input)) {
     Check_NArrayType2($input,NA_SFLOAT,NA_SCOMPLEX);
@@ -130,15 +113,6 @@ VALUE mirlib_eWrappedMirlibError;
 // Length of complex data must be twice the length of flags
 %typemap(in) (int * flags, int n) (int nflag) {
   int i;
-  // If FIXNUM or BIGNUM, allocate NA_LINT array that many
-  // This only makes sense for reads (or writing zeros)
-  if(TYPE($input) == T_FIXNUM || TYPE($input) == T_BIGNUM) {
-    nflag = NUM2INT($input);
-    int rank = 1;
-    int shape = nflag;
-    VALUE naclass = rb_const_get(rb_cObject,rb_intern("NArray"));
-    $input = na_make_object(NA_LINT,rank,&shape,naclass);
-  }
   // If NArray
   if(NA_IsNArray($input)) {
     Check_NArrayType($input,NA_LINT);

data/ext/miriad_wrap.c

@@ -2631,14 +2631,6 @@ _wrap_Uvio_write(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (uvio *)(argp1);
   {
-    // If FIXNUM allocate NA_DFLOAT array that many
-    // This only makes sense for reads (or writing zeros)
-    if(TYPE(argv[0]) == T_FIXNUM) {
-      int rank = 1;
-      int shape = FIX2INT(argv[0]);
-      VALUE naclass = rb_const_get(rb_cObject,rb_intern("NArray"));
-      argv[0] = na_make_object(NA_DFLOAT,rank,&shape,naclass);
-    }
     // If NArray
     if(NA_IsNArray(argv[0])) {
       Check_NArrayType(argv[0],NA_DFLOAT);
@@ -2660,15 +2652,6 @@ _wrap_Uvio_write(int argc, VALUE *argv, VALUE self) {
   }
   {
     int i;
-    // If FIXNUM or BIGNUM, allocate NA_SCOMPLEX array that many
-    // This only makes sense for reads (or writing zeros)
-    if(TYPE(argv[1]) == T_FIXNUM || TYPE(argv[1]) == T_BIGNUM) {
-      ndata3 = NUM2INT(argv[1]);
-      int rank = 1;
-      int shape = ndata3;
-      VALUE naclass = rb_const_get(rb_cObject,rb_intern("NArray"));
-      argv[1] = na_make_object(NA_SCOMPLEX,rank,&shape,naclass);
-    }
     // If NArray
     if(NA_IsNArray(argv[1])) {
       Check_NArrayType2(argv[1],NA_SFLOAT,NA_SCOMPLEX);
@@ -2692,15 +2675,6 @@ _wrap_Uvio_write(int argc, VALUE *argv, VALUE self) {
   }
   {
     int i;
-    // If FIXNUM or BIGNUM, allocate NA_LINT array that many
-    // This only makes sense for reads (or writing zeros)
-    if(TYPE(argv[2]) == T_FIXNUM || TYPE(argv[2]) == T_BIGNUM) {
-      nflag4 = NUM2INT(argv[2]);
-      int rank = 1;
-      int shape = nflag4;
-      VALUE naclass = rb_const_get(rb_cObject,rb_intern("NArray"));
-      argv[2] = na_make_object(NA_LINT,rank,&shape,naclass);
-    }
     // If NArray
     if(NA_IsNArray(argv[2])) {
       Check_NArrayType(argv[2],NA_LINT);
@@ -2807,15 +2781,6 @@ _wrap_Uvio_wwrite(int argc, VALUE *argv, VALUE self) {
   arg1 = (uvio *)(argp1);
   {
     int i;
-    // If FIXNUM or BIGNUM, allocate NA_SCOMPLEX array that many
-    // This only makes sense for reads (or writing zeros)
-    if(TYPE(argv[0]) == T_FIXNUM || TYPE(argv[0]) == T_BIGNUM) {
-      ndata2 = NUM2INT(argv[0]);
-      int rank = 1;
-      int shape = ndata2;
-      VALUE naclass = rb_const_get(rb_cObject,rb_intern("NArray"));
-      argv[0] = na_make_object(NA_SCOMPLEX,rank,&shape,naclass);
-    }
     // If NArray
     if(NA_IsNArray(argv[0])) {
       Check_NArrayType2(argv[0],NA_SFLOAT,NA_SCOMPLEX);
@@ -2839,15 +2804,6 @@ _wrap_Uvio_wwrite(int argc, VALUE *argv, VALUE self) {
   }
   {
     int i;
-    // If FIXNUM or BIGNUM, allocate NA_LINT array that many
-    // This only makes sense for reads (or writing zeros)
-    if(TYPE(argv[1]) == T_FIXNUM || TYPE(argv[1]) == T_BIGNUM) {
-      nflag3 = NUM2INT(argv[1]);
-      int rank = 1;
-      int shape = nflag3;
-      VALUE naclass = rb_const_get(rb_cObject,rb_intern("NArray"));
-      argv[1] = na_make_object(NA_LINT,rank,&shape,naclass);
-    }
     // If NArray
     if(NA_IsNArray(argv[1])) {
       Check_NArrayType(argv[1],NA_LINT);
@@ -3015,14 +2971,6 @@ _wrap_Uvio_uvread(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (uvio *)(argp1);
   {
-    // If FIXNUM allocate NA_DFLOAT array that many
-    // This only makes sense for reads (or writing zeros)
-    if(TYPE(argv[0]) == T_FIXNUM) {
-      int rank = 1;
-      int shape = FIX2INT(argv[0]);
-      VALUE naclass = rb_const_get(rb_cObject,rb_intern("NArray"));
-      argv[0] = na_make_object(NA_DFLOAT,rank,&shape,naclass);
-    }
     // If NArray
     if(NA_IsNArray(argv[0])) {
       Check_NArrayType(argv[0],NA_DFLOAT);
@@ -3044,15 +2992,6 @@ _wrap_Uvio_uvread(int argc, VALUE *argv, VALUE self) {
   }
   {
     int i;
-    // If FIXNUM or BIGNUM, allocate NA_SCOMPLEX array that many
-    // This only makes sense for reads (or writing zeros)
-    if(TYPE(argv[1]) == T_FIXNUM || TYPE(argv[1]) == T_BIGNUM) {
-      ndata3 = NUM2INT(argv[1]);
-      int rank = 1;
-      int shape = ndata3;
-      VALUE naclass = rb_const_get(rb_cObject,rb_intern("NArray"));
-      argv[1] = na_make_object(NA_SCOMPLEX,rank,&shape,naclass);
-    }
     // If NArray
     if(NA_IsNArray(argv[1])) {
       Check_NArrayType2(argv[1],NA_SFLOAT,NA_SCOMPLEX);
@@ -3076,15 +3015,6 @@ _wrap_Uvio_uvread(int argc, VALUE *argv, VALUE self) {
   }
   {
     int i;
-    // If FIXNUM or BIGNUM, allocate NA_LINT array that many
-    // This only makes sense for reads (or writing zeros)
-    if(TYPE(argv[2]) == T_FIXNUM || TYPE(argv[2]) == T_BIGNUM) {
-      nflag4 = NUM2INT(argv[2]);
-      int rank = 1;
-      int shape = nflag4;
-      VALUE naclass = rb_const_get(rb_cObject,rb_intern("NArray"));
-      argv[2] = na_make_object(NA_LINT,rank,&shape,naclass);
-    }
     // If NArray
     if(NA_IsNArray(argv[2])) {
       Check_NArrayType(argv[2],NA_LINT);
@@ -3199,15 +3129,6 @@ _wrap_Uvio_uvwread(int argc, VALUE *argv, VALUE self) {
   arg1 = (uvio *)(argp1);
   {
     int i;
-    // If FIXNUM or BIGNUM, allocate NA_SCOMPLEX array that many
-    // This only makes sense for reads (or writing zeros)
-    if(TYPE(argv[0]) == T_FIXNUM || TYPE(argv[0]) == T_BIGNUM) {
-      ndata2 = NUM2INT(argv[0]);
-      int rank = 1;
-      int shape = ndata2;
-      VALUE naclass = rb_const_get(rb_cObject,rb_intern("NArray"));
-      argv[0] = na_make_object(NA_SCOMPLEX,rank,&shape,naclass);
-    }
     // If NArray
     if(NA_IsNArray(argv[0])) {
       Check_NArrayType2(argv[0],NA_SFLOAT,NA_SCOMPLEX);
@@ -3231,15 +3152,6 @@ _wrap_Uvio_uvwread(int argc, VALUE *argv, VALUE self) {
   }
   {
     int i;
-    // If FIXNUM or BIGNUM, allocate NA_LINT array that many
-    // This only makes sense for reads (or writing zeros)
-    if(TYPE(argv[1]) == T_FIXNUM || TYPE(argv[1]) == T_BIGNUM) {
-      nflag3 = NUM2INT(argv[1]);
-      int rank = 1;
-      int shape = nflag3;
-      VALUE naclass = rb_const_get(rb_cObject,rb_intern("NArray"));
-      argv[1] = na_make_object(NA_LINT,rank,&shape,naclass);
-    }
     // If NArray
     if(NA_IsNArray(argv[1])) {
       Check_NArrayType(argv[1],NA_LINT);

data/lib/miriad.rb

@@ -7,7 +7,7 @@
 #    astronomy related methods to Ruby classes.
 #
 #--
-# $Id: miriad.rb 15 2008-04-22 05:26:51Z davidm $
+# $Id: miriad.rb 18 2008-04-23 17:31:29Z davidm $
 #++
 
 require 'rbconfig'
@@ -588,18 +588,22 @@ module Miriad
     # The MIRIAD flags
     attr_accessor :flags
     # Constructs a new Visibility object containing the given +preamble+,
-    # +data+, and +flags+ objects.  Not used often.  Usually Visibility objects
-    # are obtained from Uvio#read.
+    # +data+, and +flags+ objects.  Not often used directly.  Usually
+    # Visibility objects are obtained from Uvio#read.
     def initialize(preamble, data, flags)
       @preamble = preamble
       @data = data
       @flags = flags
     end
-    # call-seq: Visibility[preamble, data, flags]
+    # call-seq: Visibility[nchan]
     #
-    # Alternate way to contruct a Visibility object.
-    def self.[](preamble, data, flags)
-      self.new(preamble, data, flags)
+    # Contruct a Visibility object capable of holding +nchan+ channels of data.
+    def self.[](nchan)
+      self.new(
+        NArray.dfloat(5),
+        NArray.scomplex(nchan),
+        NArray.int(nchan)
+      )
     end
     # call-seq: coord() -> [u, v, w]
     #
@@ -697,28 +701,21 @@ module Miriad
     end
 
     # call-seq:
-    #   read() -> uvread(5, nchan, nchan) -> Visibility
-    #   read(nil) -> uvread(5, nchan, nchan) -> Visibility
-    #   read(vis) -> uvread(vis.preamble, vis.data, vis.flags) -> Visibility
-    #   read(*args) -> uvread(*args) -> Visibility
+    #   read(vis=nil) -> vis or Visibility[nchan] or nil
     #
     # Convenience wrapper around uvread.  Shortens data and flags if they were
     # passed in longer than necessary.  Always returns a Visibility, except at
-    # end of file in which case it returns +nil+.
+    # end of file in which case it returns +nil+.  If passed +nil+ (or no
+    # argument), a new Visibility object will be created, populated, and
+    # returned.  Otherwise, +vis+ will be modified in place and returned.
     #
     # See uvread for details.
     #
     # <b>This method should be preferred over uvread.  uvread may disappear in
     # future versions!</b>
-    def read(*args)
-      if args.length == 0 || args[0].nil?
-        nchan = getvr('nchan') || 0
-        n, p, d, f = uvread(5,nchan,nchan)
-      elsif args.length == 1 && Visibility === args[0]
-        n, p, d, f = uvread(args[0].preamble,args[0].data,args[0].flags)
-      else
-        n, p, d, f = uvread(*args)
-      end
+    def read(vis=nil)
+      vis = Visibility[nchan] if vis.nil?
+      n, p, d, f = uvread(vis.preamble,vis.data,vis.flags)
 
       # Return nil on EOF
       return nil if n == 0
@@ -731,8 +728,14 @@ module Miriad
       f = f[0...flen] if flen != f.length
 
       # Return Visibility
-      return args[0] if Visibility === args[0]
-      Visibility[p,d,f]
+      vis
+    end
+
+    # call-seq: nchan -> Integer
+    #
+    # Returns the current value of the _nchan_ uv variable or zero if it is not (yet) present.
+    def nchan
+      getvr('nchan') || 0
     end
 
     # call-seq: polstr -> String

metadata

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