Changeset 2904 for trunk

Timestamp:

03/13/14 13:59:13 (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): Module Names change impacts.

Description: Describe your changes here...

Support for numeric value for freq_tol in sd.merge.

Location:

trunk

Files:

• python/asapmath.py (modified) (2 diffs)
• src/STMath.cpp (modified) (1 diff)

trunk/python/asapmath.py

@@ +1 @@
+import re
 from asap.scantable import scantable
 from asap.parameters import rcParams
@@ -851 +852 @@
     if kwargs.has_key('freq_tol'):
         freq_tol = str(kwargs['freq_tol'])
+        if len(freq_tol) > 0 and re.match('.+[GMk]Hz$', freq_tol) is None:
+            freq_tol += 'Hz'
     else:
         freq_tol = ''

trunk/src/STMath.cpp

@@ -2554 +2554 @@
     }
     freqTolInHz = freqTolInQuantity.getValue("Hz");
+    LogIO os(LogOrigin("STMath", "merge", WHERE));
+    os << "frequency tolerance = " << freqTolInHz << "Hz" << LogIO::POST;
   }