Changeset 2818 for trunk/python

Timestamp:

07/02/13 10:38:18 (11 years ago)

Author:

Malte Marquarding

Message:

Issue #291: added scantable.set_sourcename to overwrite sourcename to allow freq_align to work. Exposed 'SOURCE' averaging to python api. Added some logging to freq_align refering to the sources it aligns to

Location:

trunk/python

Files:

• __init__.py (modified) (1 diff)
• asapmath.py (modified) (1 diff)
• scantable.py (modified) (4 diffs)

trunk/python/__init__.py

@@ -59 +59 @@
 
 __date__ = '$Date$'.split()[1]
-__version__  = 'trunk'
+__version__  = '4.1.3a'
 __revision__ = get_revision()
 

trunk/python/asapmath.py

@@ -90 +90 @@
     else:
         #s = scantable(stm._average(alignedlst, mask, weight.upper(), scanav))
-        s = scantable(stm._new_average(alignedlst, compel, mask, weight.upper(), scanav))
+        s = scantable(stm._new_average(alignedlst, compel, mask, 
+                                       weight.upper(), scanav))
     s._add_history("average_time",varlist)
 

trunk/python/scantable.py

@@ -2112 +2112 @@
     #
     @asaplog_post_dec
-    def average_time(self, mask=None, scanav=False, weight='tint', align=False):
+    def average_time(self, mask=None, scanav=False, weight='tint', align=False,
+                     avmode="NONE"):
         """\
         Return the (time) weighted average of a scan. Scans will be averaged
@@ -2140 +2141 @@
             align:    align the spectra in velocity before averaging. It takes
                       the time of the first spectrum as reference time.
+            avmode:   'SOURCE' - also select by source name -  or 
+                      'NONE' (default). Not applicable for scanav=True or
+                      weight=median
 
         Example::
@@ -2150 +2154 @@
         weight = weight or 'TINT'
         mask = mask or ()
-        scanav = (scanav and 'SCAN') or 'NONE'
+        scanav = (scanav and 'SCAN') or avmode.upper()
         scan = (self, )
 
         if align:
             scan = (self.freq_align(insitu=False), )
+            asaplog.push("Note: Alignment is don on a source-by-source basis")
+            asaplog.push("Note: Averaging (by default) is not")
+            # we need to set it to SOURCE averaging here            
         s = None
         if weight.upper() == 'MEDIAN':
@@ -4246 +4253 @@
         self._add_history("set_sourcetype", varlist)
 
+
+    def set_sourcename(self, name):
+        varlist = vars()
+        self._setsourcename(name)
+        self._add_history("set_sourcename", varlist)
+
     @asaplog_post_dec
     @preserve_selection