Changeset 1259 for trunk/python/scantable.py

Timestamp:

09/11/06 15:10:05 (18 years ago)

Author:

mar637

Message:

Merge from Release2.1.0b tag

File:

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

trunk/python/scantable.py

@@ -33 +33 @@
         if average is None:
             average = rcParams['scantable.autoaverage']
-        #varlist = vars()
+        varlist = vars()
         from asap._asap import stmath
         self._math = stmath()
@@ -72 +72 @@
                   and isinstance(filename[-1], str):
                 self._fill(filename, unit, average)
+        self._add_history("scantable", varlist)
         print_log()
 
@@ -344 +345 @@
             print "--------------------------------------------------"
             print out
-        retval = { 'axesnames': ['scanno', 'beamno', 'ifno', 'polno', 'cycleno'],
-                   'axes' : axes,
-                   'data': statvals}
-        return retval
+            return
+        else:
+            retval = { 'axesnames': ['scanno', 'beamno', 'ifno', 'polno', 'cycleno'],
+                       'axes' : axes,
+                       'data': statvals}
+            return retval
 
     def stddev(self, mask=None):
@@ -366 +369 @@
 
 
-    def column_names(self):
+    def get_column_names(self):
         """
         Return a  list of column names, which can be used for selection.
         """
-        return list(Scantable.column_names(self))
+        return list(Scantable.get_column_names(self))
 
     def get_tsys(self):
@@ -809 +812 @@
                 for i in xrange(len(freqs)):
                     sel.set_ifs([i])
+                    self._setselection(sel)
                     self._setrestfreqs(freqs[i]["value"],
                                        freqs[i]["name"], "MHz")
-                    self._setselection(sel)
                 self._setselection(savesel)
         # freqs are to be taken from a linecatalog
@@ -831 +834 @@
 
 
-    def history(self):
+    def history(self, filename=None):
+        """
+        Print the history. Optionally to a file.
+        """
         hist = list(self._gethistory())
         out = "-"*80
@@ -848 +854 @@
                     out += "\n   %s = %s" % (s[0], s[1])
                 out += "\n"+"-"*80
-        try:
-            from IPython.genutils import page as pager
-        except ImportError:
-            from pydoc import pager
-        pager(out)
+        if filename is not None:
+            if filename is "":
+                filename = 'scantable_history.txt'
+            import os
+            filename = os.path.expandvars(os.path.expanduser(filename))
+            if not os.path.isdir(filename):
+                data = open(filename, 'w')
+                data.write(out)
+                data.close()
+            else:
+                msg = "Illegal file name '%s'." % (filename)
+                if rcParams['verbose']:
+                    print msg
+                else:
+                    raise IOError(msg)
+        if rcParams['verbose']:
+            try:
+                from IPython.genutils import page as pager
+            except ImportError:
+                from pydoc import pager
+            pager(out)
+        else:
+            return out
         return
-
     #
     # Maths business
@@ -1676 +1699 @@
             self.set_fluxunit(unit)
         self.set_freqframe(rcParams['scantable.freqframe'])
-        #self._add_history("scantable", varlist)
-
+