Changeset 1589 for trunk/python/asapmath.py

Timestamp:

07/02/09 12:17:20 (15 years ago)

Author:

Malte Marquarding

Message:

Introduced print_log_dec(orator)

File:

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

trunk/python/asapmath.py

@@ -1 +1 @@
 from asap.scantable import scantable
 from asap import rcParams
-from asap import print_log
+from asap import print_log_dec
 from asap import selector
 
+@print_log_dec
 def average_time(*args, **kwargs):
     """
@@ -27 +28 @@
         # without using a mask
         scanav = average_time(scana,scanb)
-        # or equivalent
-        # scanav = average_time([scana, scanb])
+        # or equivalent
+        # scanav = average_time([scana, scanb])
         # return the (time) averaged scan, i.e. the average of
         # all correlator cycles
@@ -88 +89 @@
         s = scantable(stm._average(alignedlst, mask, weight.upper(), scanav))
     s._add_history("average_time",varlist)
-    print_log()
     return s
 
@@ -111 +111 @@
     s = scantable(stm._quotient(source, reference, preserve))
     s._add_history("quotient",varlist)
-    print_log()
     return s
 
+@print_log_dec
 def dototalpower(calon, caloff, tcalval=0.0):
     """
@@ -129 +129 @@
     s = scantable(stm._dototalpower(calon, caloff, tcalval))
     s._add_history("dototalpower",varlist)
-    print_log()
     return s
 
+@print_log_dec
 def dosigref(sig, ref, smooth, tsysval=0.0, tauval=0.0):
     """
@@ -149 +149 @@
     s = scantable(stm._dosigref(sig, ref, smooth, tsysval, tauval))
     s._add_history("dosigref",varlist)
-    print_log()
     return s
 
+@print_log_dec
 def calps(scantab, scannos, smooth=1, tsysval=0.0, tauval=0.0, tcalval=0.0):
     """
@@ -237 +237 @@
     ress = dosigref(sig, ref, smooth, tsysval, tauval)
     ress._add_history("calps", varlist)
-    print_log()
     return ress
 
+@print_log_dec
 def calnod(scantab, scannos=[], smooth=1, tsysval=0.0, tauval=0.0, tcalval=0.0):
     """
@@ -308 +308 @@
     resspec = scantable(stm._donod(scantab, pairScans, smooth, tsysval,tauval,tcalval))
     resspec._add_history("calnod",varlist)
-    print_log()
     return resspec
 
+@print_log_dec
 def calfs(scantab, scannos=[], smooth=1, tsysval=0.0, tauval=0.0, tcalval=0.0):
     """
@@ -349 +349 @@
     resspec = scantable(stm._dofs(s, scannos, smooth, tsysval,tauval,tcalval))
     resspec._add_history("calfs",varlist)
-    print_log()
     return resspec
 
@@ -367 +366 @@
     print "simple_math is deprecated use +=/* instead."
 
+@print_log_dec
 def merge(*args):
     """
@@ -375 +375 @@
     Example:
         myscans = [scan1, scan2]
-        allscans = merge(myscans)
-        # or equivalent
-        sameallscans = merge(scan1, scan2)
+        allscans = merge(myscans)
+        # or equivalent
+        sameallscans = merge(scan1, scan2)
     """
     varlist = vars()
@@ -400 +400 @@
     s = scantable(stm._merge(lst))
     s._add_history("merge", varlist)
-    print_log()
     return s
-