Changeset 2429 for trunk

Timestamp:

03/13/12 19:45:42 (13 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-2796)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): asap.scantable

Description: a minor modification in scantable.freq_align.

Location:

trunk

Files:

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

trunk/python/scantable.py

@@ -2056 +2056 @@
         """
         if insitu is None: insitu = rcParams["insitu"]
+        oldInsitu = self._math._insitu()
         self._math._setinsitu(insitu)
         varlist = vars()
@@ -2061 +2062 @@
         s = scantable(self._math._freq_align(self, reftime, method))
         s._add_history("freq_align", varlist)
+        self._math._setinsitu(oldInsitu)
         if insitu: 
             self._assign(s)

trunk/src/STMath.cpp

@@ -2770 +2770 @@
                              mask, timeCol(i), !first,
                              interp, False);
-          (void) ok; // unused stop compiler nagging      
+          (void) ok; // unused stop compiler nagging
           // back into scantable
           flagOut.resize(maskOut.nelements());