Changeset 976

Timestamp:

04/03/06 16:39:42 (18 years ago)

Author:

mar637

Message:

Ticket #12 - read of multiple rpf files into one scantable.

File:

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

trunk/python/scantable.py

@@ -1 +1 @@
 from asap._asap import Scantable
 from asap import rcParams
-from asap import print_log
+from asap import print_log, asaplog
 from asap import selector
 from numarray import ones,zeros
@@ -30 +30 @@
                          in existing scantables
         """
-        if average is None or type(average) is not bool:
+        if average is None:
             average = rcParams['scantable.autoaverage']
-
         varlist = vars()
         from asap._asap import stmath
         self._math = stmath()
-        from asap import asaplog
         if isinstance(filename, Scantable):
             Scantable.__init__(self, filename)
-            if unit is not None:
-                self.set_fluxunit(unit)
-        else:
-            import os.path
-            if not os.path.exists(filename):
-                s = "File '%s' not found." % (filename)
-                if rcParams['verbose']:
-                    asaplog.push(s)
-                    print asaplog.pop().strip()
-                    return
-                raise IOError(s)
-            filename = os.path.expandvars(filename)
-            if os.path.isdir(filename):
-                # crude check if asap table
-                if os.path.exists(filename+'/table.info'):
-                    Scantable.__init__(self, filename, "memory")
-                    if unit is not None:
-                        self.set_fluxunit(unit)
+        else:
+            if isinstance(filename,str):
+                import os.path
+                filename = os.path.expandvars(filename)
+                filename = os.path.expanduser(filename)
+                if not os.path.exists(filename):
+                    s = "File '%s' not found." % (filename)
+                    if rcParams['verbose']:
+                        asaplog.push(s)
+                        print asaplog.pop().strip()
+                        return
+                    raise IOError(s)
+                if os.path.isdir(filename):
+                    # crude check if asap table
+                    if os.path.exists(filename+'/table.info'):
+                        Scantable.__init__(self, filename, "memory")
+                        if unit is not None:
+                            self.set_fluxunit(unit)
+                        self.set_freqframe(rcParams['scantable.freqframe'])
+                    else:
+                        msg = "The given file '%s'is not a valid asap table." % (filename)
+                        if rcParams['verbose']:
+                            print msg
+                            return
+                        else:
+                            raise IOError(msg)
                 else:
-                    msg = "The given file '%s'is not a valid asap table." % (filename)
-                    if rcParams['verbose']:
-                        print msg
-                        return
-                    else:
-                        raise IOError(msg)
-            else:
-                from asap._asap import stfiller
-                ifSel = -1
-                beamSel = -1
-                r = stfiller()
-                r._open(filename,ifSel,beamSel)
-                asaplog.push('Importing data...')
-                print_log()
-                r._read()
-                tbl = r._getdata()
-                if unit is not None:
-                    tbl.set_fluxunit(unit)
-                if average:
-                    asaplog.push('Auto averaging integrations...')
-                    print_log()
-                    tbl2 = self._math._average((tbl,),(),'NONE','SCAN', False)
-                    Scantable.__init__(self,tbl2)
-                    del tbl2
-                else:
-                    Scantable.__init__(self,tbl)
-                del r,tbl
-                self._add_history("scantable", varlist)
+                    self._fill([filename],unit, average)
+            elif (isinstance(filename,list) or isinstance(filename,tuple)) \
+                  and isinstance(filename[-1], str):
+                self._fill(filename, unit, average)
         print_log()
 
@@ -209 +191 @@
         return Scantable._summary(self,True)
 
-    def summary(self, filename=None, verbose=None):
+    def summary(self, filename=None):
         """
         Print a summary of the contents of this scantable.
@@ -218 +200 @@
                          The default (False) is taken from .asaprc
         """
-        info = Scantable._summary(self, verbose)
-        if verbose is None: verbose = rcParams['scantable.verbosesummary']
+        info = Scantable._summary(self, True)
+        #if verbose is None: verbose = rcParams['scantable.verbosesummary']
         if filename is not None:
             if filename is "":
@@ -772 +754 @@
         """
         varlist = vars()
-        if weight is None: weight = 'tint'
+        if weight is None: weight = 'TINT'
         if mask is None: mask = ()
         if scanav:
@@ -1046 +1028 @@
                         both sides of the spectrum. Default is to keep
                         all channels. Nested tuples represent individual
-                        edge selection for different IFs (a number of spectral
-                        channels can be different)
+                        edge selection for different IFs (a number of spectral
+                        channels can be different)
             order:      the order of the polynomial (default is 0)
             threshold:  the threshold used by line finder. It is better to
@@ -1065 +1047 @@
         from asap import _is_sequence_or_number as _is_valid
 
-        # check whether edge is set up for each IF individually
-        individualEdge = False;
-        if len(edge)>1:
-           if isinstance(edge[0],list) or isinstance(edge[0],tuple):
-               individualEdge = True;
+        # check whether edge is set up for each IF individually
+        individualEdge = False;
+        if len(edge)>1:
+           if isinstance(edge[0],list) or isinstance(edge[0],tuple):
+               individualEdge = True;
 
         if not _is_valid(edge, int) and not individualEdge:
@@ -1076 +1058 @@
             to make individual selection for different IFs."
 
-        curedge = (0,0)
-        if individualEdge:
-           for edge_par in edge:
-               if not _is_valid(edge,int):
-                  raise ValueError, "Each element of the 'edge' tuple has \
+        curedge = (0,0)
+        if individualEdge:
+           for edge_par in edge:
+               if not _is_valid(edge,int):
+                  raise ValueError, "Each element of the 'edge' tuple has \
                   to be a pair of integers or an integer."
         else:
-           curedge = edge;
+           curedge = edge;
 
         # setup fitter
@@ -1107 +1089 @@
             asaplog.push(msg, False)
 
-            # figure out edge parameter
-            if individualEdge:
-               if len(edge)>=workscan.getif(r):
-                  raise RuntimeError, "Number of edge elements appear to be less than the number of IFs"
-                  curedge = edge[workscan.getif(r)]
-
-            # setup line finder
+            # figure out edge parameter
+            if individualEdge:
+               if len(edge)>=workscan.getif(r):
+                  raise RuntimeError, "Number of edge elements appear to be less than the number of IFs"
+                  curedge = edge[workscan.getif(r)]
+
+            # setup line finder
             fl.find_lines(r,mask,curedge)
             f.set_scan(workscan, fl.get_mask())
@@ -1360 +1342 @@
         if row > self.nrow():
             return
-        from asap import asapfit
+        from asap.asapfit import asapfit
         fit = asapfit(self._getfit(row))
         if rcParams['verbose']:
@@ -1435 +1417 @@
         nchans = filter(lambda t: t > 0, nchans)
         return (sum(nchans)/len(nchans) == nchans[0])
+
+    def _fill(self, names, unit, average):
+        import os
+        varlist = vars()
+        from asap._asap import stfiller
+        first = True
+        fullnames = []
+        for name in names:
+            name = os.path.expandvars(name)
+            name = os.path.expanduser(name)
+            if not os.path.exists(name):
+                msg = "File '%s' does not exists" % (name)
+                if rcParams['verbose']:
+                    asaplog.push(msg)
+                    print asaplog.pop().strip()
+                    return
+                raise IOError(msg)
+            fullnames.append(name)
+        if average:
+            asaplog.push('Auto averaging integrations')
+        for name in fullnames:
+            r = stfiller()
+            msg = "Importing %s..." % (name)
+            asaplog.push(msg,False)
+            print_log()
+            r._open(name,-1,-1)
+            r._read()
+            tbl = r._getdata()
+            if average:
+                tbl = self._math._average((tbl,),(),'NONE','SCAN', False)
+                #tbl = tbl2
+            if not first:
+                tbl = self._math._merge([self, tbl])
+                #tbl = tbl2
+            Scantable.__init__(self, tbl)
+            r._close()
+            del r,tbl
+            first = False
+        if unit is not None:
+            self.set_fluxunit(unit)
+        self.set_freqframe(rcParams['scantable.freqframe'])
+        #self._add_history("scantable", varlist)
+