Changeset 2186 for trunk/src/STMath.cpp

Timestamp:

06/07/11 23:49:53 (13 years ago)

Author:

WataruKawasaki

Message:

New Development: Yes

JIRA Issue: Yes CAS-3149

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: scantable.*sinusoid_baseline() params

Test Programs:

Put in Release Notes: Yes

Module(s):

Description: (1) Implemented an automated sinusoidal fitting functionality

(2) FFT available with scantable.fft()
(3) fixed a bug of parsing 'edge' param used by linefinder.
(4) a function to show progress status for row-based iterations.

File:

• trunk/src/STMath.cpp (modified) (4 diffs)

trunk/src/STMath.cpp

@@ -49 +49 @@
 #include <atnf/PKSIO/SrcType.h>
 
-#include "MathUtils.h"
 #include "RowAccumulator.h"
 #include "STAttr.h"
@@ -2827 +2826 @@
   std::vector<float> res;
   Table tab = in->table();
-  ArrayColumn<Float> specCol(tab, "SPECTRA");
-  ArrayColumn<uChar> flagCol(tab, "FLAGTRA");
-  FFTServer<Float,Complex> ffts;
+  std::vector<bool> mask;
 
   if (whichrow.size() < 1) {          // for all rows (by default)
     int nrow = int(tab.nrow());
     for (int i = 0; i < nrow; ++i) {
-      Vector<Float> spec = specCol(i);
-      Vector<uChar> flag = flagCol(i);
-      doFFT(res, ffts, getRealImag, spec, flag);
+      res = in->execFFT(i, mask, getRealImag);
     }
   } else {                           // for specified rows
     for (uInt i = 0; i < whichrow.size(); ++i) {
-      Vector<Float> spec = specCol(whichrow[i]);
-      Vector<uChar> flag = flagCol(whichrow[i]);
-      doFFT(res, ffts, getRealImag, spec, flag);
+      res = in->execFFT(i, mask, getRealImag);
     }
   }
@@ -2849 +2842 @@
 }
 
-void asap::STMath::doFFT( std::vector<float>& out, 
-                          FFTServer<Float,Complex>& ffts, 
-                          bool getRealImag,
-                          Vector<Float>& spec, 
-                          Vector<uChar>& flag )
-{
-  doZeroOrderInterpolation(spec, flag);
-
-  Vector<Complex> fftout;
-  ffts.fft0(fftout, spec);
-
-  float norm = float(2.0/double(spec.size()));
-  if (getRealImag) {
-    for (uInt j = 0; j < fftout.size(); ++j) {
-      out.push_back(real(fftout[j])*norm);
-      out.push_back(imag(fftout[j])*norm);
-    }
-  } else {
-    for (uInt j = 0; j < fftout.size(); ++j) {
-      out.push_back(abs(fftout[j])*norm);
-      out.push_back(arg(fftout[j]));
-    }
-  }
-
-}
-
-void asap::STMath::doZeroOrderInterpolation( Vector<Float>& spec, 
-                                             Vector<uChar>& flag )
-{
-  int fstart = -1;
-  int fend = -1;
-  for (uInt i = 0; i < flag.nelements(); ++i) {
-    if (flag[i] > 0) {
-      fstart = i;
-      while (flag[i] > 0 && i < flag.nelements()) {
-        fend = i;
-        i++;
-      }
-    }
-
-    // execute interpolation as the following criteria:
-    // (1) for a masked region inside the spectrum, replace the spectral 
-    //     values with the mean of those at the two channels just outside 
-    //     the both edges of the masked region. 
-    // (2) for a masked region at the spectral edge, replace the values 
-    //     with the one at the nearest non-masked channel. 
-    //     (ZOH, but bilateral)
-    Float interp = 0.0;
-    if (fstart-1 > 0) {
-      interp = spec[fstart-1];
-      if (fend+1 < Int(spec.nelements())) {
-        interp = (interp + spec[fend+1]) / 2.0;
-      }
-    } else {
-      interp = spec[fend+1];
-    }
-    if (fstart > -1 && fend > -1) {
-      for (int j = fstart; j <= fend; ++j) {
-        spec[j] = interp;
-      }
-    }
-
-    fstart = -1;
-    fend = -1;
-  }
-}
 
 CountedPtr<Scantable>
@@ -2939 +2866 @@
       Vector<Float> spec = specCol(i);
       Vector<uChar> flag = flagCol(i);
-      doZeroOrderInterpolation(spec, flag);
+      std::vector<bool> mask;
+      for (uInt j = 0; j < flag.nelements(); ++j) {
+        mask.push_back(!(flag[j]>0));
+      }
+      mathutil::doZeroOrderInterpolation(spec, mask);
 
       Vector<Complex> lags;