miriad 4.1.0.8 → 4.1.0.10

data/Rakefile

@@ -1,4 +1,4 @@
-# $Id: Rakefile 26 2008-05-09 23:28:16Z davidm $
+# $Id: Rakefile 31 2008-05-16 20:11:25Z 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.8'
+  s.version = '4.1.0.10'
   s.summary = 'Ruby interface to MIRIAD'
   s.description = <<-EOS
     The MIRIAD-Ruby package...

data/ext/uvio.c

@@ -165,8 +165,11 @@
 /*  pjt  25apr06 Add ATNF's new uvdim_c and match sourcenames w/o case  */
 /*  pjt  22aug06 merged versions; finish dazim/delev selection code     */
 /*  pjt  22may07 added code for purpose, fixed uvread_match()           */
-/*  pjt  06feb08 allow seeing() selection on smonrms and rmspath        */
+/*  pjt  06feb08 allow seeing() selection on smonrms or rmspath         */
 /*               cf. 08oct07 addition to ATNF version of uvio.c         */
+/*  pjt   8may08 wrap HA back into -12..12 from -24..24..               */
+/*  dhem 13may08 Change uvputvr_c to always update var's buffer         */
+/*  dhem 14may08 uvputvr_c always reallocs var's buffer on size change  */
 /*----------------------------------------------------------------------*/
 /*									*/
 /*		Handle UV files.					*/
@@ -257,7 +260,7 @@
 /*		list to be formed for hashing.				*/
 /*									*/
 /*----------------------------------------------------------------------*/
-#define VERSION_ID "6-feb-08 pjt"
+#define VERSION_ID "8-may-08 pjt"
 
 #define private static
 
@@ -1710,8 +1713,7 @@ void uvputvr_c(int tno,int type,Const char *var,Const char *data,int n)
     hwritei_c(uv->item,&v->length,uv->offset+UV_HDR_SIZE,H_INT_SIZE,&iostat);
     CHECK(iostat,(message,"Error writing variable-length for %s, in UVPUTVR",var));
     uv->offset += UV_ALIGN;
-    if( !(v->flags & UVF_NOCHECK) )
-      v->buf = Realloc(v->buf,n*internal_size[type]);
+    v->buf = Realloc(v->buf,n*internal_size[type]);
   }
 
 /* Check if this variable has really changed.  */
@@ -1740,10 +1742,12 @@ void uvputvr_c(int tno,int type,Const char *var,Const char *data,int n)
     uv->offset = mroundup( uv->offset+v->length, UV_ALIGN);
     if(v->callno++ > CHECK_THRESH) {
       v->flags |= UVF_NOCHECK;
-    } else if(!(v->flags & UVF_NOCHECK)){
-      length = internal_size[type] * n;
-      memcpy(v->buf,data,length);
-    } 
+    }
+    length = internal_size[type] * n;
+    if(!v->buf) {
+      ERROR('f',(message,"Buffer for variable '%s' is NULL in UVPUTVR",var));
+    }
+    memcpy(v->buf,data,length);
   } else {
     v->callno = 0;
   }
@@ -2260,7 +2264,7 @@ void uvselect_c(int tno,Const char *object,double p1,double p2,int datasel)
 		"uvrange","pointing","amplitude","window","or","dra",
 		"ddec","uvnrange","increment","ra","dec","and", "clear",
 		"on","polarization","shadow","auto","dazim","delev",
-                "purpose","seeing"
+                "purpose","seeing" (should be 28?)
     p1,p2	Generally this is the range of values to select. For
 		"antennae", this is the two antennae pair to select.
 		For "antennae", a zero indicates "all antennae".
@@ -3438,6 +3442,9 @@ private int uvread_select(UV *uv)
     if(op->type == SEL_HA){
       discard = !op->discard;
       ha = *(double *)uv->lst->buf - *(double *)uv->obsra->buf;
+      /* ha can be -24..24 so needs to be back to -12..12 */
+      if (ha < -PI) ha += 2*PI;
+      if (ha > PI) ha -= 2*PI;
       while(n < sel->noper && op->type == SEL_HA){
         if(op->loval <= ha && ha <= op->hival)
 	  discard = op->discard;

metadata

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