Changeset 2437 for trunk/src/STMath.cpp

Timestamp:

03/16/12 17:53:28 (12 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: unit test of sdsmooth

Put in Release Notes: No

Module(s):

Description:

Changed the equation to calculate regridded spectral coordinate in
scantable.regrid_channel() so that it would have the same values as
the result of scantable.bin().
scantable.bin() now rebins Tsys arrays if necessary.

File:

• trunk/src/STMath.cpp (modified) (1 diff)

trunk/src/STMath.cpp

@@ -1930 +1930 @@
   ArrayColumn<Float> specCol(tout, "SPECTRA");
   ArrayColumn<uChar> flagCol(tout, "FLAGTRA");
+  ArrayColumn<Float> tsysCol(tout, "TSYS");
+
   for (uInt i=0; i < tout.nrow(); ++i ) {
     MaskedArray<Float> main  = maskedArray(specCol(i), flagCol(i));
     MaskedArray<Float> maout;
     LatticeUtilities::bin(maout, main, 0, Int(width));
-    /// @todo implement channel based tsys binning
     specCol.put(i, maout.getArray());
     flagCol.put(i, flagsFromMA(maout));
+    if (tsysCol(i).nelements() == specCol(i).nelements()) {
+      MaskedArray<Float> matsysin = maskedArray(tsysCol(i), flagCol(i));
+      MaskedArray<Float> matsysout;
+      LatticeUtilities::bin(matsysout, matsysin, 0, Int(width));
+      tsysCol.put(i, matsysout.getArray());
+    }
     // take only the first binned spectrum's length for the deprecated
     // global header item nChan