Changeset 1576 for trunk/python

Timestamp:

06/29/09 13:40:55 (16 years ago)

Author:

Malte Marquarding

Message:

Ticket #169: allow direct settings of selections

Location:

trunk/python

Files:

• scantable.py (modified) (2 diffs)
• selector.py (modified) (2 diffs)

trunk/python/scantable.py

@@ -312 +312 @@
         return selector(self._getselection())
 
-    def set_selection(self, selection=selector()):
+    def set_selection(self, selection=None, **kw):
         """
         Select a subset of the data. All following operations on this scantable
@@ -325 +325 @@
             scan.set_selection()     # unset the selection
         """
+        if selection is None:
+            # reset
+            if len(kw) == 0:
+                selection = selector()
+            else:
+                # try keywords
+                for k in kw:
+                    if k not in selector.fields:
+                        raise KeyError("Invalid selection key '%s', valid keys are %s" % (k, selector.fields))
+                selection = selector(**kw)
         self._setselection(selection)
 

trunk/python/selector.py

@@ -7 +7 @@
     scantables to specific rows.
     """
-    def __init(self):
-        _selector.__init__(self)
+    fields = ["pols", "ifs", "beams", "scans", "cycles", "name", "query"]
+
+    def __init__(self, *args, **kw):
+        if len(args) == 1:
+            if isinstance(args[0], self.__class__) \
+               or isinstance(args[0], _selector):
+                _selector.__init__(self, args[0])
+            else:
+                raise TypeError("Argument can only be a selector object")
+        else:
+            _selector.__init__(self)
+            for k,v  in kw.items():
+                if k in self.fields:
+                    func = getattr(self, "set_%s" % k)
+                    func(v)
 
     def reset(self):
@@ -45 +58 @@
         else:
             raise TypeError('Unknown pol type. Please use [0,1...] or ["XX","YY"...]')
-    
+
     # for the americans
     set_polarizations = set_polarisations