Changeset 1446 for branches/alma/python/asapmath.py

Timestamp:

11/12/08 17:04:01 (16 years ago)

Author:

TakTsutsumi

Message:

Merged recent updates (since 2007) from nrao-asap

File:

• branches/alma/python/asapmath.py (modified) (2 diffs)

branches/alma/python/asapmath.py

@@ -45 +45 @@
     if kwargs.has_key('align'):
         align = kwargs.get('align')
+    compel = False
+    if kwargs.has_key('compel'):
+        compel = kwargs.get('compel')
     varlist = vars()
     if isinstance(args[0],list):
@@ -86 +89 @@
         del merged
     else:
-        s = scantable(stm._average(alignedlst, mask, weight.upper(), scanav))
+        #s = scantable(stm._average(alignedlst, mask, weight.upper(), scanav))
+        s = scantable(stm._new_average(alignedlst, compel, mask, weight.upper(), scanav))
     s._add_history("average_time",varlist)
     print_log()