Changeset 411 for trunk/python/scantable.py

Timestamp:

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

Author:

mar637

Message:

Added handling of environment variables throughout.

File:

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

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)