Changeset 411

Timestamp:

02/11/05 14:37:03 (19 years ago)

Author:

mar637

Message:

Added handling of environment variables throughout.

Location:

trunk/python

Files:

• asaplot.py (modified) (2 diffs)
• asapmath.py (modified) (2 diffs)
• asapreader.py (modified) (3 diffs)
• scantable.py (modified) (5 diffs)

trunk/python/asaplot.py

@@ -626 +626 @@
             
         d = ['png','.ps','eps']
+
+        from os.path import expandvars
+        fname = expandvars(fname)
+
         if fname[-3:].lower() in d:
             try:
@@ -676 +680 @@
 
 
-def load_colours(file='/usr/local/lib/rgb.txt'):
+def load_colours(filename='/usr/local/lib/rgb.txt'):
     """
     Load the colour dictionary from the specified file.
     """
     print 'Loading colour dictionary from', file
-    rgb = open(file, 'r')
+    from os.path import expandvars
+    filename = expandvars(filename)
+    rgb = open(filename, 'r')
 
     while True:

trunk/python/asapmath.py

@@ -160 +160 @@
         return
 
-def gain_el(scan, poly=None, filename="", method="linear", insitu=None, allaxes=None):
+def gain_el(scan, poly=None, filename="", method="linear",
+            insitu=None, allaxes=None):
     """
     Return a scan after applying a gain-elevation correction. The correction
@@ -204 +205 @@
        poly = ()
     if insitu is None: insitu = rcParams['insitu']
+    from os.path import expandvars
+    filename = expandvars(filename)
     if not insitu:
         from asap._asap import gainel as _gainEl

trunk/python/asapreader.py

@@ -36 +36 @@
         if thebeam is None:
             thebeam = -1
+        from os.path import expandvars
+        filename = expandvars(filename)
         sdreader.__init__(self, filename, theif, thebeam)
 
@@ -63 +65 @@
         return scantable(tbl)
 
-    def summary(self):
+    def summary(self, name=None):
         """
         Print a summary of all scans/integrations. This reads through the
@@ -74 +76 @@
         sdreader._reset(self)
         sdreader._read(self,[-1])
-        tbl = sdreader._getdata(self)
+        from asap import scantable
+        tbl = scantable(sdreader._getdata(self))
         sdreader._reset(self)
-        print tbl._summary()
+        print tbl.summary(name=name)
         return
 ##     def reset(self):

trunk/python/scantable.py

@@ -35 +35 @@
                 self.set_fluxunit(unit)                       
         else:
-            try:
-                mode = st(filename)[stat.ST_MODE]
-            except OSError:
-                print "File not found"
+            import os.path
+            if not os.path.exists(filename):
+                print "File '%s' not found." % (filename)
                 return
-            if stat.S_ISDIR(mode):
+            filename = os.path.expandvars(filename)
+            if os.path.isdir(filename):
                 # crude check if asap table
-                if stat.S_ISREG(st(filename+'/table.info')[stat.ST_MODE]):
+                if os.path.exists(filename+'/table.info'):
                     sdtable.__init__(self, filename)
                     if unit is not None:
                         self.set_fluxunit(unit)                       
                 else:
-                    print 'The given file is not a valid asap table'
+                    print "The given file '%s'is not a valid asap table." % (filename)
                     return
             else:
@@ -57 +57 @@
                 r = sdreader(filename,ifSel,beamSel)
                 print 'Importing data...'
-                r.read([-1])
-                tbl = r.getdata()
+                r._read([-1])
+                tbl = r._getdata()
                 if unit is not None:
                     tbl.set_fluxunit(unit)
@@ -86 +86 @@
                                        'MS2' (saves as an aips++
                                               MeasurementSet V2)
-            overwrite:   if the file should be overwritten if it exists.
+            overwrite:   If the file should be overwritten if it exists.
                          The default False is to return with warning
-                         without writing the output
+                         without writing the output. USE WITH CARE.
         Example:
             scan.save('myscan.asap')
             scan.save('myscan.sdfits','SDFITS')
         """
+        from os import path
         if format is None: format = rcParams['scantable.save']
         suffix = '.'+format.lower()
@@ -98 +99 @@
             name = 'scantable'+suffix
             print "No filename given. Using default name %s..." % name
-        from os import path
+        name = path.expandvars(name)
         if path.isfile(name) or path.isdir(name):
             if not overwrite:
@@ -166 +167 @@
             if filename is "":
                 filename = 'scantable_summary.txt'
+            from os.path import expandvars
+            filename = expandvars(filename)
             data = open(filename, 'w')
             data.write(info)