Ignore:
Timestamp:
08/02/10 10:51:45 (14 years ago)
Author:
Malte Marquarding
Message:

merge -r1774:1797 from alma to newfiller

Location:
branches/newfiller
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/newfiller

  • branches/newfiller/python/asapmath.py

    r1757 r1798  
    66from asap import asaplotgui
    77
    8 #@print_log_dec
     8@print_log_dec
    99def average_time(*args, **kwargs):
    1010    """
     
    123123    return s
    124124
    125 #@print_log_dec
     125@print_log_dec
    126126def dototalpower(calon, caloff, tcalval=0.0):
    127127    """
     
    142142    return s
    143143
    144 #@print_log_dec
     144@print_log_dec
    145145def dosigref(sig, ref, smooth, tsysval=0.0, tauval=0.0):
    146146    """
     
    163163    return s
    164164
    165 #@print_log_dec
     165@print_log_dec
    166166def calps(scantab, scannos, smooth=1, tsysval=0.0, tauval=0.0, tcalval=0.0, verify=False):
    167167    """
     
    446446    return ress
    447447
    448 #@print_log_dec
     448@print_log_dec
    449449def calnod(scantab, scannos=[], smooth=1, tsysval=0.0, tauval=0.0, tcalval=0.0, verify=False):
    450450    """
     
    687687    return resspec
    688688
    689 #@print_log_dec
     689@print_log_dec
    690690def calfs(scantab, scannos=[], smooth=1, tsysval=0.0, tauval=0.0, tcalval=0.0, verify=False):
    691691    """
     
    895895    return resspec
    896896
    897 #@print_log_dec
     897@print_log_dec
    898898def merge(*args):
    899899    """
Note: See TracChangeset for help on using the changeset viewer.