Changeset 1883

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.

Location:

trunk

Files:

• external-alma/atnf/PKSIO/PKSreader.cc (modified) (1 diff)
• python/asapmath.py (modified) (3 diffs)
• python/scantable.py (modified) (3 diffs)

trunk/external-alma/atnf/PKSIO/PKSreader.cc

@@ -102 +102 @@
 
   } else if (inFile.isDirectory()) {
-    if (File(name + "/DATA_DESCRIPTION").exists()) {
+    Bool isMS = ( (File(name+"/table.info").exists()) 
+                  && File(name+"/table.dat").exists() );
+    if (isMS) {
+      RegularFileIO ifs(name+"/table.info") ;
+      char buf[128] ;
+      ifs.read(sizeof(buf),buf,False) ;
+      if ( strstr( buf, "Measurement Set" ) == NULL ) 
+        isMS = False ;
+    }
+    //if (File(name + "/DATA_DESCRIPTION").exists()) {
+    if (isMS) {
       // MS version 2.
       #ifdef NOPKSMS

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))

trunk/python/scantable.py

@@ -37 +37 @@
 
     """
-    return (os.path.isdir(filename)
-            and not os.path.exists(filename+'/table.f1')
-            and os.path.exists(filename+'/table.info'))
-
-
+    if ( os.path.isdir(filename)
+         and os.path.exists(filename+'/table.info')
+         and os.path.exists(filename+'/table.dat') ):
+        f=open(filename+'/table.info')
+        l=f.readline()
+        f.close()
+        #if ( l.find('Scantable') != -1 ):
+        if ( l.find('Measurement Set') == -1 ):
+            return True
+        else:
+            return False
+    else:
+        return False
+##     return (os.path.isdir(filename)
+##             and not os.path.exists(filename+'/table.f1')
+##             and os.path.exists(filename+'/table.info'))
+
+def is_ms(filename):
+    """Is the given file a MeasurementSet?
+
+    Parameters:
+
+        filename: the name of the file/directory to test
+
+    """
+    if ( os.path.isdir(filename)
+         and os.path.exists(filename+'/table.info')
+         and os.path.exists(filename+'/table.dat') ):
+        f=open(filename+'/table.info')
+        l=f.readline()
+        f.close()
+        if ( l.find('Measurement Set') != -1 ):
+            return True
+        else:
+            return False
+    else:
+        return False
+    
 class scantable(Scantable):
     """\
@@ -87 +120 @@
         if antenna is not None:
             asaplog.push("Antenna selection currently unsupported."
-                         "Using '0'")
+                         "Using ''")
             asaplog.post('WARN')
         if antenna is None:
@@ -123 +156 @@
                     # do not reset to the default freqframe
                     #self.set_freqframe(rcParams['scantable.freqframe'])
-                elif os.path.isdir(filename) \
-                         and not os.path.exists(filename+'/table.f1'):
+                #elif os.path.isdir(filename) \
+                #         and not os.path.exists(filename+'/table.f1'):
+                elif is_ms(filename):
+                    self._fill([filename], unit, average, getpt, antenna)
+                else:
                     msg = "The given file '%s'is not a valid " \
                           "asap table." % (filename)
                     raise IOError(msg)
-                else:
-                    self._fill([filename], unit, average, getpt, antenna)
             elif (isinstance(filename, list) or isinstance(filename, tuple)) \
                   and isinstance(filename[-1], str):