Changeset 1916 for trunk

Timestamp:

08/30/10 19:13:04 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: sd regression tests

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

The antenna and getpt parameters for MS filler is effective again.

Location:

trunk

Files:

• python/scantable.py (modified) (6 diffs)
• src/PKSFiller.cpp (modified) (4 diffs)

trunk/python/scantable.py

@@ -82 +82 @@
 
     @asaplog_post_dec
-    def __init__(self, filename, average=None, unit=None, getpt=None,
-                 antenna=None, parallactify=None):
+    #def __init__(self, filename, average=None, unit=None, getpt=None,
+    #             antenna=None, parallactify=None):
+    def __init__(self, filename, average=None, unit=None, parallactify=None, **args):
         """\
         Create a scantable from a saved one or make a reference
@@ -117 +118 @@
         if average is None:
             average = rcParams['scantable.autoaverage']
-        if getpt is None:
-            getpt = True
-        if antenna is not None:
-            asaplog.push("Antenna selection currently unsupported."
-                         "Using ''")
-            asaplog.post('WARN')
-        if antenna is None:
-            antenna = ''
-        elif type(antenna) == int:
-            antenna = '%s' % antenna
-        elif type(antenna) == list:
-            tmpstr = ''
-            for i in range( len(antenna) ):
-                if type(antenna[i]) == int:
-                    tmpstr = tmpstr + ('%s,'%(antenna[i]))
-                elif type(antenna[i]) == str:
-                    tmpstr=tmpstr+antenna[i]+','
-                else:
-                    raise TypeError('Bad antenna selection.')
-            antenna = tmpstr.rstrip(',')
+        #if getpt is None:
+        #    getpt = True
+        #if antenna is not None:
+        #    asaplog.push("Antenna selection currently unsupported."
+        #                 "Using ''")
+        #    asaplog.post('WARN')
+        #if antenna is None:
+        #    antenna = ''
+        #elif type(antenna) == int:
+        #    antenna = '%s' % antenna
+        #elif type(antenna) == list:
+        #    tmpstr = ''
+        #    for i in range( len(antenna) ):
+        #        if type(antenna[i]) == int:
+        #            tmpstr = tmpstr + ('%s,'%(antenna[i]))
+        #        elif type(antenna[i]) == str:
+        #            tmpstr=tmpstr+antenna[i]+','
+        #        else:
+        #            raise TypeError('Bad antenna selection.')
+        #    antenna = tmpstr.rstrip(',')
         parallactify = parallactify or rcParams['scantable.parallactify']
         varlist = vars()
@@ -160 +161 @@
                 #         and not os.path.exists(filename+'/table.f1'):
                 elif is_ms(filename):
-                    self._fill([filename], unit, average, getpt, antenna)
+                    # Measurement Set
+                    opts={'ms': {}}
+                    mskeys=['getpt','antenna']
+                    for key in mskeys:
+                        if key in args.keys():
+                            opts['ms'][key] = args[key]
+                    #self._fill([filename], unit, average, getpt, antenna)
+                    self._fill([filename], unit, average, opts)
                 elif os.path.isfile(filename):
-                    self._fill([filename], unit, average, getpt, antenna)
+                    #self._fill([filename], unit, average, getpt, antenna)
+                    self._fill([filename], unit, average)
                 else:
                     msg = "The given file '%s'is not a valid " \
@@ -169 +178 @@
             elif (isinstance(filename, list) or isinstance(filename, tuple)) \
                   and isinstance(filename[-1], str):
-                self._fill(filename, unit, average, getpt, antenna)
+                #self._fill(filename, unit, average, getpt, antenna)
+                self._fill(filename, unit, average)
         self.parallactify(parallactify)
         self._add_history("scantable", varlist)
@@ -2663 +2673 @@
 
     @asaplog_post_dec
-    def _fill(self, names, unit, average, getpt, antenna):
+    #def _fill(self, names, unit, average, getpt, antenna):
+    def _fill(self, names, unit, average, opts={}):
         first = True
         fullnames = []
@@ -2683 +2694 @@
             msg = "Importing %s..." % (name)
             asaplog.push(msg, False)
-            opts = {'ms': {'antenna' : antenna, 'getpt': getpt} }
+            #opts = {'ms': {'antenna' : antenna, 'getpt': getpt} }
             r.open(name, opts)# antenna, -1, -1, getpt)
             r.fill()

trunk/src/PKSFiller.cpp

@@ -20 +20 @@
 #include <casa/Arrays/ArrayLogical.h>
 #include <casa/Utilities/Regex.h>
+#include <casa/Utilities/DataType.h>
 #include <casa/Logging/LogIO.h>
 
@@ -35 +36 @@
 
 #include <time.h>
+#include <sstream>
 
 #include "STDefs.h"
@@ -76 +78 @@
 
   String antenna("");
+  Bool getPt = False;
+
+  // parsing MS options
+  if ( rec.isDefined( "ms" ) ) {
+    Record msrec = rec.asRecord( "ms" ) ;
+    //msrec.print( cout ) ;
+    if ( msrec.isDefined( "getpt" ) ) {
+      getPt = msrec.asBool( "getpt" ) ;
+    }
+    if ( msrec.isDefined( "antenna" ) ) {
+      if ( msrec.type( msrec.fieldNumber( "antenna" ) ) == TpInt ) {
+        Int antInt = msrec.asInt( "antenna" ) ;
+        ostringstream oss ;
+        oss << antInt ;
+        antenna = String( oss ) ;
+      }
+      else {
+        antenna = msrec.asString( "antenna" ) ;
+      }
+    }
+  }
 
   reader_ = getPKSreader(inName, antenna, 0, 0, format, beams, ifs,
@@ -147 +170 @@
   Vector<Int> start(nIF_, 1);
   Vector<Int> end(nIF_, 0);
-  Bool getPt = False;
   reader_->select(beams, ifs, start, end, ref, True, haveXPol_[0], False, getPt);
   setHeader(header);