Changeset 1073 for trunk

Timestamp:

07/06/06 11:21:41 (18 years ago)

Author:

mar637

Message:

Ticket #48 - enable disk based scantable. added scan averaging to average_channel

File:

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

trunk/python/scantable.py

@@ -52 +52 @@
                     # crude check if asap table
                     if os.path.exists(filename+'/table.info'):
-                        Scantable.__init__(self, filename, "memory")
+                        Scantable.__init__(self, filename, rcParams['scantable.storage']=='disk')
                         if unit is not None:
                             self.set_fluxunit(unit)
@@ -790 +790 @@
         return s
 
-    def average_channel(self, mode="MEDIAN", align=False):
+    def average_channel(self, mode="MEDIAN", scanav=False, align=False):
         """
         Return the (median) average of a scan.
         Note:
             in channels only - align if necessary
-            the mdeian Tsys is computed.
+            the median Tsys is computed.
         Parameters:
             one scan or comma separated  scans
             mode:     type of average, default "MEDIAN"
+            scanav:   True averages each scan separately
+                      False (default) averages all scans together,
             align:    align the spectra in velocity before averaging. It takes
                       the time of the first spectrum as reference time.
         Example:
-            # mdeian average the scan
+            # median average the scan
             newscan = scan.average_channel()
         """
         varlist = vars()
         if mode is None: mode = 'MEDIAN'
+        scanav = "NONE"
+        if scanav: scanav = "SCAN"
         scan = self
         try:
           if align:
               scan = self.freq_align(insitu=False)
-          s = scantable(self._math._averagechannel(scan, mode))
+          s = scantable(self._math._averagechannel(scan, mode, scanav))
         except RuntimeError,msg:
             if rcParams['verbose']:
@@ -1523 +1527 @@
         if average:
             asaplog.push('Auto averaging integrations')
+        stype = int(rcParams['scantable.storage'] == 'disk')
         for name in fullnames:
-            r = stfiller()
+            tbl = Scantable(stype)
+            print stype
+            r = stfiller(tbl)
             msg = "Importing %s..." % (name)
             asaplog.push(msg,False)
@@ -1530 +1537 @@
             r._open(name,-1,-1)
             r._read()
-            tbl = r._getdata()
+            #tbl = r._getdata()
             if average:
                 tbl = self._math._average((tbl,),(),'NONE','SCAN')