Changeset 945

Timestamp:

03/30/06 15:38:41 (18 years ago)

Author:

mar637

Message:

fixed scanAv->scanav mix up

File:

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

trunk/python/asapmath.py

@@ -61 +61 @@
             else:
                 raise TypeError(msg)
-    if scanAv: scanAv = "SCAN"
-    else: scanAv = "NONE"
+    if scanav: scanav = "SCAN"
+    else: scanav = "NONE"
     s = scantable(stm._average(lst, mask, weight, scanav, align))
     s._add_history("average_time",varlist)
@@ -118 +118 @@
 
 def merge(*args):
+    """
+    """
     varlist = vars()
     if isinstance(args[0],list):