Changeset 2753 for trunk/python

Timestamp:

01/31/13 13:00:04 (11 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: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

More bug fix on is_scantable()

File:

• trunk/python/scantable.py (modified) (2 diffs)

trunk/python/scantable.py

@@ -46 +46 @@
         l=f.readline()
         f.close()
-        match_pattern = '^Type = Scantable *$'
-        unmatch_pattern = '^Type = (MeasurementSet|Image|ApplyTable) *$'
-        #if ( l.find('Scantable') != -1 ):
+        match_pattern = '^Type = (Scantable)? *$'
         if re.match(match_pattern,l):
-            return True
-        #elif ( l.find('Measurement Set') == -1 and
-        #       l.find('Image') == -1):
-        elif re.match(unmatch_pattern,l):
             return True
         else:
@@ -243 +237 @@
                     # Measurement Set
                     opts={'ms': {}}
-                    mskeys=['getpt','antenna']
+                    mskeys=['getpt','antenna','freq_tolsr']
                     for key in mskeys:
                         if key in args.keys():