Changeset 2933 for trunk/python

Timestamp:

04/22/14 12:50:16 (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_spw_selection() so that adjacent channel ranges in the same spw in the output merged into one range. for example, a result before this modification {20:0.0,30.0],[31.0,40.0} now should be {20:0.0,40.0}.

File:

• trunk/python/scantable.py (modified) (1 diff)

trunk/python/scantable.py

@@ -2146 +2146 @@
         for spw in res.keys():
             if spw in valid_ifs:
-                # remove duplicated chennal ranges
+                # remove duplicated channel 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):
+                        if ((res[spw][i][0]-res[spw][j][1])*(res[spw][i][1]-res[spw][j][0]) <= 0) or \
+                            (min(abs(res[spw][i][0]-res[spw][j][1]),abs(res[spw][j][0]-res[spw][i][1])) == 1):
                             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])