Changeset 2932 for trunk

Timestamp:

04/21/14 16:36:29 (11 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-6465

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sd

Description: modified sd.scantable.parse_{idx|spw}_selection() so that no duplicated values appear in returned values.

File:

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

trunk/python/scantable.py

@@ -2145 +2145 @@
 
         for spw in res.keys():
-            if spw not in valid_ifs:
+            if spw in valid_ifs:
+                # remove duplicated chennal ranges
+                for i in reversed(xrange(len(res[spw]))):
+                    for j in xrange(i):
+                        if ((res[spw][i][0]-res[spw][j][1])*(res[spw][i][1]-res[spw][j][0]) <= 0):
+                            res[spw][j][0] = min(res[spw][i][0], res[spw][j][0])
+                            res[spw][j][1] = max(res[spw][i][1], res[spw][j][1])
+                            res[spw].pop(i)
+                            break
+            else:
                 del res[spw]
 
@@ -2374 +2383 @@
             for thelist in currlist:
                 idxlist += range(thelist[0],thelist[1]+1)
+        # remove duplicated elements after first ones
+        for i in reversed(xrange(len(idxlist))):
+            if idxlist.index(idxlist[i]) < i:
+                idxlist.pop(i)
         msg = "Selected %s: %s" % (mode.upper()+"NO", str(idxlist))
         asaplog.push(msg)