Changeset 1349 for trunk/python

Timestamp:

04/26/07 14:33:19 (18 years ago)

Author:

mar637

Message:

added american spelling alias
fixed concatenation of queries.

File:

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

trunk/python/selector.py

@@ -45 +45 @@
         else:
             raise TypeError('Unknown pol type. Please use [0,1...] or ["XX","YY"...]')
+    
+    # for the americans
+    set_polarization = set_polarisations
 
     def set_ifs(self, ifs=[]):
@@ -196 +199 @@
             vec.sort()
             v[2](unique(vec))
-        
-        union.set_query(other.get_query() + " AND " + self.get_query())
+        q = other.get_query()
+        qs = self.get_query()
+        if len(q) and len(qs):
+            union.set_query(qs +" AND " + q)
+        else:
+            if len(q):
+                union.set_query(q)
+            elif len(qs):
+                union.set_query(qs)
         return union