Changeset 2480

Timestamp:

05/04/12 11:11:09 (12 years ago)

Author:

Malte Marquarding

Message:

Ticket #269: fix for custom reference scan expressions not being honoured.

File:

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

trunk/python/scantable.py

@@ -436 +436 @@
 
         """
-#         info = Scantable._summary(self)
         if filename is not None:
             if filename is "":
@@ -442 +441 @@
             from os.path import expandvars, isdir
             filename = expandvars(filename)
-#             if not isdir(filename):
-#                 data = open(filename, 'w')
-#                 data.write(info)
-#                 data.close()
-#             else:
             if isdir(filename):
                 msg = "Illegal file name '%s'." % (filename)
@@ -453 +447 @@
             filename = ""
         Scantable._summary(self, filename)
-#         info = Scantable._summary(self, filename)
-#         return page(info)
 
     def get_spectrum(self, rowno):
@@ -3335 +3327 @@
         """
         varlist = vars()
-        basesel = self.get_selection()
         stype = -1
-        if sourcetype.lower().startswith("r"):
+        if sourcetype.lower().startswith("r") or sourcetype.lower() == "off":
             stype = 1
-        elif sourcetype.lower().startswith("s"):
+        elif sourcetype.lower().startswith("s") or sourcetype.lower() == "on":
             stype = 0
         else:
-            raise ValueError("Illegal sourcetype use s(ource) or r(eference)")
+            raise ValueError("Illegal sourcetype use s(ource)/on or r(eference)/off")
         if matchtype.lower().startswith("p"):
             matchtype = "pattern"
@@ -3353 +3344 @@
             sel = match
         else:
-            sel.set_query("SRCNAME == %s('%s')" % (matchtype, match))
+            sel.set_query("SRCNAME=%s('%s')" % (matchtype, match))
+        self.set_selection(sel)
         self._setsourcetype(stype)
         self._add_history("set_sourcetype", varlist)
@@ -3688 +3680 @@
             else:
                 r = filler( tbl )
-                rx = rcParams['scantable.reference']
-                r.setreferenceexpr(rx)
             msg = "Importing %s..." % (name)
             asaplog.push(msg, False)
             r.open(name, opts)
+            rx = rcParams['scantable.reference']
+            r.setreferenceexpr(rx)
             r.fill()
             if average: