Changeset 2900 for trunk/src/STMathWrapper.h

Timestamp:

03/12/14 12:23:31 (10 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/src/STMathWrapper.h (modified) (1 diff)

trunk/src/STMathWrapper.h

@@ -175 +175 @@
 
   ScantableWrapper
-    merge(const std::vector<ScantableWrapper >& in)
-
+    merge(const std::vector<ScantableWrapper >& in,
+          const std::string &freqTol)
   {
     std::vector<casa::CountedPtr<Scantable> > sts;
     for (unsigned int i=0; i<in.size(); ++i) sts.push_back(in[i].getCP());
-    return ScantableWrapper(STMath::merge(sts)); }
+    return ScantableWrapper(STMath::merge(sts, freqTol)); }
 
   ScantableWrapper rotateXYPhase( const ScantableWrapper& in, float angle)