Changeset 2987 for trunk/python

Timestamp:

08/20/14 16:35:38 (10 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes:

Module(s): sd

Description: fixed parse_idx_selection for mode='row' so that it returns a list of existing row numbers only.

File:

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

trunk/python/scantable.py

@@ -2405 +2405 @@
         if smode == 'r':
             minidx = 0
-            maxidx = self.nrow()
+            maxidx = self.nrow()-1
         else:
             idx = getattr(self,"get"+mode+"nos")()
@@ -2425 +2425 @@
             if idxlist.index(idxlist[i]) < i:
                 idxlist.pop(i)
+
+        # remove elements outside range [minidx, maxidx] for smode='r'
+        if smode == 'r':
+            for i in reversed(xrange(len(idxlist))):
+                if (idxlist[i] < minidx) or (idxlist[i] > maxidx):
+                    idxlist.pop(i)
+        
         msg = "Selected %s: %s" % (mode.upper()+"NO", str(idxlist))
         asaplog.push(msg)