Changeset 1875

Timestamp:

08/13/10 16:07:29 (14 years ago)

Author:

Malte Marquarding

Message:

Added srctype enum handling

Location:

trunk/python

Files:

• __init__.py (modified) (1 diff)
• scantable.py (modified) (1 diff)
• selector.py (modified) (2 diffs)

trunk/python/__init__.py

@@ -52 +52 @@
 from opacity import skydip
 from opacity import model as opacity_model
+from _asap import srctype
 
 __date__ = '$Date$'.split()[1]

trunk/python/scantable.py

@@ -2248 +2248 @@
         if mode.lower() == "paired":
             sel = self.get_selection()
-            sel.set_query("SRCTYPE==1")
+            sel.set_query("SRCTYPE==psoff")
             self.set_selection(sel)
             offs = self.copy()
-            sel.set_query("SRCTYPE==0")
+            sel.set_query("SRCTYPE==pson")
             self.set_selection(sel)
             ons = self.copy()

trunk/python/selector.py

@@ -1 @@
-from asap._asap import selector as _selector
+import re
+from asap._asap import selector as _selector, srctype
 from asap.utils import unique, _to_list
 
@@ -148 +149 @@
         Example:
             # select all off scans with integration times over 60 seconds.
-            selection.set_query("SRCTYPE == 1 AND INTERVAL > 60.0")
-        """
+            selection.set_query("SRCTYPE == PSOFF AND INTERVAL > 60.0")
+        """
+        rx = re.compile("((SRCTYPE *[!=][=] *)([a-zA-Z.]+))", re.I)
+        for r in rx.findall(query):
+            sval = None
+            stype = r[-1].lower()
+            if stype.find('srctype.') == -1:
+                stype = ".".join(["srctype", stype])
+            try:
+                sval = eval(stype)
+                sval = "%s%d" % (r[1], sval)
+            except:
+                continue
+            query = query.replace(r[0], sval)
         taql = "SELECT FROM $1 WHERE " + query
         self._settaql(taql)