Changeset 1757 for branches/alma/python/selector.py

Timestamp:

06/09/10 19:03:06 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-2211)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: ASAP 3.0.0 interface changes

Test Programs:

Put in Release Notes: Yes

Module(s): all the CASA sd tools and tasks are affected.

Description: Merged ATNF-ASAP 3.0.0 developments to CASA (alma) branch.

Note you also need to update casa/code/atnf.

Location:

branches/alma

Files:

• . (modified) (2 props)
• python/selector.py (modified) (3 diffs)

branches/alma/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
@@ -220 +233 @@
         Merge two selections.
         """
+        if self.is_empty():
+            return other
+        elif other.is_empty():
+            return self
         union = selector()
         gets = [[self._getscans(), other._getscans(), union._setscans],