Changeset 2900 for trunk/python

Timestamp:

03/12/14 12:23:31 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-5875

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: test_sdcoadd

Put in Release Notes: No

Module(s): sd

Description: Describe your changes here...

Added freq_tol parameter to asapmath.merge.
The freq_tol allows to specify frequency tolerance as
numeric value (1.0e6) or string ('1MHz'). The value will
be used to merge FREQUENCIES rows, FREQ_ID, and IFNO.

File:

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

trunk/python/asapmath.py

@@ -823 +823 @@
 
 @asaplog_post_dec
-def merge(*args):
+def merge(*args, **kwargs):
     """
     Merge a list of scanatables, or comma-sperated scantables into one
@@ -829 +829 @@
     Parameters:
         A list [scan1, scan2] or scan1, scan2.
+        freq_tol: frequency tolerance for merging IFs. numeric values
+                  in units of Hz (1.0e6 -> 1MHz) and string ('1MHz')
+                  is allowed.
     Example:
         myscans = [scan1, scan2]
@@ -834 +837 @@
         # or equivalent
         sameallscans = merge(scan1, scan2)
+        # with freqtol
+        allscans = merge(scan1, scan2, freq_tol=1.0e6)
+        # or equivalently
+        allscans = merge(scan1, scan2, freq_tol='1MHz')
     """
     varlist = vars()
@@ -842 +849 @@
     else:
         lst = tuple(args)
+    if kwargs.has_key('freq_tol'):
+        freq_tol = str(kwargs['freq_tol'])
+    else:
+        freq_tol = ''
     varlist["args"] = "%d scantables" % len(lst)
     # need special formatting her for history...
@@ -850 +861 @@
             msg = "Please give a list of scantables"
             raise TypeError(msg)
-    s = scantable(stm._merge(lst))
+    s = scantable(stm._merge(lst, freq_tol))
     s._add_history("merge", varlist)
     return s