Changeset 981 for trunk/python/scantable.py

Timestamp:

04/04/06 11:58:41 (18 years ago)

Author:

mar637

Message:

Removed align option from average in c++ as it is buggy.
python is now applying it.

File:

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

trunk/python/scantable.py

@@ -757 +757 @@
         if mask is None: mask = ()
         if scanav:
-          scanav = "SCAN"
-        else:
-          scanav = "NONE"
-        s = scantable(self._math._average((self,), mask, weight.upper(),
-                      scanav, align))
+            scanav = "SCAN"
+        else:
+            scanav = "NONE"
+        scan = (self,)
+        if align:
+            scan = (self.freq_align(insitu=False),)
+        s = scantable(self._math._average(scan, mask, weight.upper(),
+                      scanav))
         s._add_history("average_time",varlist)
         print_log()
@@ -1446 +1449 @@
             tbl = r._getdata()
             if average:
-                tbl = self._math._average((tbl,),(),'NONE','SCAN', False)
+                tbl = self._math._average((tbl,),(),'NONE','SCAN')
                 #tbl = tbl2
             if not first: