Changeset 2902 for trunk

Timestamp:

03/12/14 16:00:54 (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: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Another possible fix for broken build of standalone asap which may
be more reasonable and more robust than before.

Location:

trunk

Files:

• python/scantable.py (modified) (1 diff)
• src/python_STMath.cpp (modified) (1 diff)

trunk/python/scantable.py

@@ -5146 +5146 @@
                 tbl = self._math._average((tbl, ), (), 'NONE', 'SCAN')
             if not first:
-                tbl = self._math._merge([self, tbl], "")
+                tbl = self._math._merge([self, tbl])
             Scantable.__init__(self, tbl)
             r.close()

trunk/src/python_STMath.cpp

@@ -70 +70 @@
         .def("_convertpol", &STMathWrapper::convertPolarisation)
         .def("_opacity", &STMathWrapper::opacity)
-        .def("_merge", &STMathWrapper::merge)
+        .def("_merge", &STMathWrapper::merge,
+             (boost::python::arg("freqTol")=std::string("")) )
         .def("_rotate_xyphase", &STMathWrapper::rotateXYPhase)
         .def("_rotate_linpolphase", &STMathWrapper::rotateLinPolPhase)