Changeset 945 for trunk/python


Ignore:
Timestamp:
03/30/06 15:38:41 (19 years ago)
Author:
mar637
Message:

fixed scanAv->scanav mix up

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/python/asapmath.py

    r930 r945  
    6161            else:
    6262                raise TypeError(msg)
    63     if scanAv: scanAv = "SCAN"
    64     else: scanAv = "NONE"
     63    if scanav: scanav = "SCAN"
     64    else: scanav = "NONE"
    6565    s = scantable(stm._average(lst, mask, weight, scanav, align))
    6666    s._add_history("average_time",varlist)
    … …  
    118118
    119119def merge(*args):
     120    """
     121    """
    120122    varlist = vars()
    121123    if isinstance(args[0],list):
Note: See TracChangeset for help on using the changeset viewer.