Changeset 524 for trunk/python

Timestamp:

03/01/05 12:40:30 (20 years ago)

Author:

kil064

Message:

make 'tint' weigting the default for average_time

Location:

trunk/python

Files:

• asapmath.py (modified) (2 diffs)
• scantable.py (modified) (3 diffs)

trunk/python/asapmath.py

@@ -11 +11 @@
         scanav:   True (default) averages each scan separately
                   False averages all scans together,
-        weight:   Weighting scheme. 'none' (default), 'var' (1/var(spec) 
+        weight:   Weighting scheme. 'none, 'var' (1/var(spec) 
                   weighted), 'tsys' (1/Tsys**2 weighted), or 'tint'
-                  (integration time weighted)
+                  (integration time weighted). The default is 'tint'
     Example:
         # return a time averaged scan from scana and scanb
@@ -26 +26 @@
     if kwargs.has_key('scanav'):
        scanAv = kwargs.get('scanav')
-    weight = 'none'
+    weight = 'tint'
     if kwargs.has_key('weight'):
        weight = kwargs.get('weight')

trunk/python/scantable.py

@@ -744 +744 @@
     #
 
-    def average_time(self, mask=None, scanav=True, weight=None):
+    def average_time(self, mask=None, scanav=True, weight='tint'):
         """
         Return the (time) average of a scan, or apply it 'insitu'.
@@ -756 +756 @@
             scanav:   True (default) averages each scan separately
                       False averages all scans together,
-            weight:   Weighting scheme. 'none' (default), 'var' (1/var(spec)
+            weight:   Weighting scheme. 'none', 'var' (1/var(spec)
                       weighted), 'tsys' (1/Tsys**2 weighted), or 'tint'
-                      (integration time weighted)
+                      (integration time weighted).  The default is
+                      'tint'
         Example:
             # time average the scantable without using a mask
@@ -764 +765 @@
         """
         varlist = vars()
-        if weight is None: weight = 'none'
+        if weight is None: weight = 'tint'
         if mask is None: mask = ()
         from asap._asap import average as _av