Changeset 558

Timestamp:

03/11/05 10:17:38 (20 years ago)

Author:

mar637

Message:

Changed default for scanav in average_time to False

Location:

trunk/python

Files:

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

trunk/python/asapmath.py

@@ -9 +9 @@
         one scan or comma separated  scans
         mask:     an optional mask (only used for 'var' and 'tsys' weighting)
-        scanav:   True (default) averages each scan separately
-                  False averages all scans together,
+        scanav:   True averages each scan separately.
+                  False (default) averages all scans together,
         weight:   Weighting scheme. 'none, 'var' (1/var(spec) 
                   weighted), 'tsys' (1/Tsys**2 weighted), 'tint'
@@ -21 +21 @@
         # return the (time) averaged scan, i.e. the average of
         # all correlator cycles
-        scanav = average_time(scan)
+        scanav = average_time(scan, scanav=True)
 
     """
-    scanAv = True
+    scanAv = False
     if kwargs.has_key('scanav'):
        scanAv = kwargs.get('scanav')

trunk/python/scantable.py

@@ -744 +744 @@
     #
 
-    def average_time(self, mask=None, scanav=True, weight='tint'):
+    def average_time(self, mask=None, scanav=False, weight='tint'):
         """
         Return the (time) average of a scan, or apply it 'insitu'.
@@ -754 +754 @@
             mask:     an optional mask (only used for 'var' and 'tsys'
                       weighting)
-            scanav:   True (default) averages each scan separately
-                      False averages all scans together,
+            scanav:   True averages each scan separately
+                      False (default) averages all scans together,
             weight:   Weighting scheme. 'none', 'var' (1/var(spec)
                       weighted), 'tsys' (1/Tsys**2 weighted), 'tint'