Changeset 1883 for trunk/python/asapmath.py

Timestamp:

08/20/10 18:03:31 (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: read MS in reference table

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix on is_scantable() and similar routine in the codes.
They are now able to recognize reference table correctly.

splitant() is working with reference table. Thus, performance
is a bit improved since deep copy is no longer necessary.

File:

• trunk/python/asapmath.py (modified) (3 diffs)

trunk/python/asapmath.py

@@ -1 @@
-from asap.scantable import scantable
+from asap.scantable import scantable, is_ms
 from asap.parameters import rcParams
 from asap.logging import asaplog, asaplog_post_dec
@@ -957 +957 @@
             raise IOError(s)
         # check if input file is MS
-        if not os.path.isdir(filename) \
-               or not os.path.exists(filename+'/ANTENNA') \
-               or not os.path.exists(filename+'/table.f1'):
+        #if not os.path.isdir(filename) \
+        #       or not os.path.exists(filename+'/ANTENNA') \
+        #       or not os.path.exists(filename+'/table.f1'):
+        if not is_ms(filename):
             s = "File '%s' is not a Measurement set." % (filename)
             raise IOError(s)
@@ -996 +997 @@
     tb.open(tablename=filename,nomodify=True)
     ant1=tb.getcol('ANTENNA1',0,-1,1)
+    tb.close()
     tmpname='asapmath.splitant.tmp'
     for antid in set(ant1):
-        tbsel=tb.query('ANTENNA1 == %s && ANTENNA2 == %s'%(antid,antid))
-        tbsel.copy(tmpname,deep=True)
-        #tbsel=tb.query('ANTENNA1 == %s && ANTENNA2 == %s'%(antid,antid),tmpname)
+        tb.open(tablename=filename,nomodify=True)
+        #tbsel=tb.query('ANTENNA1 == %s && ANTENNA2 == %s'%(antid,antid))
+        #tbsel.copy(tmpname,deep=True)
+        tbsel=tb.query('ANTENNA1 == %s && ANTENNA2 == %s'%(antid,antid),tmpname)
         tbsel.close()
+        tb.close()
         del tbsel
         scan=scantable(tmpname,average=False,getpt=True,antenna=int(antid))