Changeset 2867 for trunk

Timestamp:

11/25/13 16:47:38 (11 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-5526)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: unit test of sdplot and sdbaseline

Put in Release Notes: No

Module(s): All sd tasks

Description: Enabled selection string '*' and to select all data in the range [minval,maxval] in _parse_selection(). Also minor improvements of parser to handle spaces.

File:

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

trunk/python/scantable.py

@@ -1654 +1654 @@
             maskstring = str(valid_ifs)[1:-1]
         ## split each selection "IF range[:CHAN range]"
-        sellist = maskstring.split(',')
+        # split maskstring by "<spaces>,<spaces>"
+        comma_sep = re.compile('\s*,\s*')
+        sellist = comma_sep.split(maskstring)
+        # separator by "<spaces>:<spaces>"
+        collon_sep = re.compile('\s*:\s*')
         for currselstr in sellist:
-            selset = currselstr.split(':')
+            selset = collon_sep.split(currselstr)
             # spw and mask string (may include ~, < or >)
             spwmasklist = self._parse_selection(selset[0], typestr='integer',
@@ -1796 +1800 @@
             maxidx = max(idx)
             del idx
-        sellist = selexpr.split(',')
+        # split selexpr by "<spaces>,<spaces>"
+        comma_sep = re.compile('\s*,\s*')
+        sellist = comma_sep.split(selexpr)
         idxlist = []
         for currselstr in sellist:
@@ -1829 +1835 @@
             --> returns [[0.,2.5],[5.0,7.0],[9.,9.]]
         """
-        selgroups = selstr.split(';')
+        # split selstr by '<spaces>;<spaces>'
+        semi_sep = re.compile('\s*;\s*')
+        selgroups = semi_sep.split(selstr)
         sellists = []
         if typestr.lower().startswith('int'):
@@ -1838 +1846 @@
         
         for currsel in  selgroups:
+            if currsel.strip() == '*' or len(currsel.strip()) == 0:
+                minsel = minval
+                maxsel = maxval
             if currsel.find('~') > 0:
                 # val0 <= x <= val1
                 minsel = formatfunc(currsel.split('~')[0].strip())
-                maxsel = formatfunc(currsel.split('~')[1].strip()) 
+                maxsel = formatfunc(currsel.split('~')[1].strip())
             elif currsel.strip().find('<=') > -1:
                 bound = currsel.split('<=')