Changeset 714 for trunk

Timestamp:

11/17/05 14:33:03 (19 years ago)

Author:

mar637

Message:

updated logging; added public get_sourcename

File:

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

trunk/python/scantable.py

@@ -1 +1 @@
 from asap._asap import sdtable
 from asap import rcParams
+from asap import print_log
 from numarray import ones,zeros
 import sys
@@ -63 +64 @@
                 beamSel = -1
                 r = sdreader()
-                r._setlog(asaplog)
                 r._open(filename,ifSel,beamSel)
                 asaplog.push('Importing data...')
@@ -80 +80 @@
                 del r,tbl
                 self._add_history("scantable", varlist)
-                log = asaplog.pop()
-                if len(log): print log
+        print_log()
 
     def save(self, name=None, format=None, stokes=False, overwrite=False):
@@ -397 +396 @@
                 return self._gettime(row)
 
+    def get_sourcename(self, row=-1):
+        """
+        Get a list source anmes for the observations.
+        Return a string for each integration in the scantable.
+        Parameters:
+            row:    row no of integration. Default -1 return all rows
+        Example:
+            none
+        """
+        out = []
+        if row == -1:
+            return [self._getsourcename(i) for i in range(self.nrow())]
+        else:
+            if  0 <= row < self.nrow():
+                return self._getsourcename(row)
+
     def set_unit(self, unit='channel'):
         """
@@ -558 +573 @@
         Print the list of known spectral lines
         """
-        sdtable._lines(self)
+        l = sdtable._lines(self)
+        if rcParams['verbose']:
+            print l
+        else:
+            return l
 
     def set_restfreqs(self, freqs=None, unit='Hz', lines=None, source=None,
@@ -1285 +1304 @@
         """
         modes = ["suffix","time"]
-        print mode
         if not mode in modes:
             print "please provide valid mode. Valid modes are %s" % (modes)
@@ -1476 +1494 @@
             i = j
         return segments
+
     def _get_ordinate_label(self):
         fu = "("+self.get_fluxunit()+")"