Changeset 2012 for trunk/src/ScantableWrapper.h

Timestamp:

02/25/11 16:51:50 (13 years ago)

Author:

WataruKawasaki

Message:

New Development: Yes

JIRA Issue: Yes (CAS-2373, CAS-2620)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: For Scantable::polyBaseline(), parameters and return value have been changed.

Test Programs:

Put in Release Notes: Yes

Module(s): sdbaseline, sd.linefinder

Description: (1) CAS-2373-related:

(1.1) Modified Scantable::polyBaseline() to have the row-based loop inside.

Now it fits and subtracts baseline for all rows and also output info
about the fitting result to logger and text file, while in the
previous version this method just did baseline fitting/subtraction
for one row only and had to be put inside a row-based loop at the
python side ("poly_baseline()" in scantable.py) and result output had
also to be controlled at the python side. Using a test data from NRO
45m telescope (348,000 rows, 512 channels), the processing time of
scantable.poly_baseline() has reduced from 130 minutes to 5-6 minutes.

(1.2) For accelerating the another polynomial fitting function, namely

scantable.auto_poly_baseline(), added a method
Scantable::autoPolyBaseline(). This basically does the same thing
with Scantable::polyBaseline(), but uses linefinfer also to
automatically flag the line regions.

(1.3) To make linefinder usable in Scantable class, added a method

linefinder.setdata(). This makes it possible to apply linefinder
for a float-list data given as a parameter, without setting scantable,
while it was indispensable to set scantable to use linefinger previously.

(2) CAS-2620-related:

Added Scantable::cubicSplineBaseline() and autoCubicSplineBaseline() for
fit baseline using the cubic spline function. Parameters include npiece
(number of polynomial pieces), clipthresh (clipping threshold), and
clipniter (maximum iteration number).

File:

• trunk/src/ScantableWrapper.h (modified) (2 diffs)

trunk/src/ScantableWrapper.h

@@ -230 +230 @@
   { return table_->getFit(whichrow); }
 
-  void calculateAZEL() { table_->calculateAZEL(); };
+  void calculateAZEL() { table_->calculateAZEL(); }
 
   std::vector<std::string> columnNames() const
@@ -257 +257 @@
   { table_->reshapeSpectrum( nmin, nmax ); }
 
-  STFitEntry polyBaseline(const std::vector<bool>& mask, int order, int rowno)
-  { return table_->polyBaseline(mask, order, rowno); }
-
-  void polyBaselineBatch(const std::vector<bool>& mask, int order)
-  { table_->polyBaselineBatch(mask, order); }
+  void polyBaseline(const std::vector<bool>& mask, int order, bool outlog=false, const std::string& blfile="")
+  { table_->polyBaseline(mask, order, outlog, blfile); }
+
+  void autoPolyBaseline(const std::vector<bool>& mask, int order, const std::vector<int>& edge, float threshold=5.0, int chan_avg_limit=1, bool outlog=false, const std::string& blfile="")
+  { table_->autoPolyBaseline(mask, order, edge, threshold, chan_avg_limit, outlog, blfile); }
+
+  void cubicSplineBaseline(const std::vector<bool>& mask, int npiece, float clipthresh, int clipniter, bool outlog=false, const std::string& blfile="")
+  { table_->cubicSplineBaseline(mask, npiece, clipthresh, clipniter, outlog, blfile); }
+
+  void autoCubicSplineBaseline(const std::vector<bool>& mask, int npiece, float clipthresh, int clipniter, const std::vector<int>& edge, float threshold=5.0, int chan_avg_limit=1, bool outlog=false, const std::string& blfile="")
+  { table_->autoCubicSplineBaseline(mask, npiece, clipthresh, clipniter, edge, threshold, chan_avg_limit, outlog, blfile); }
+
+  float getRms(const std::vector<bool>& mask, int whichrow)
+  { return table_->getRms(mask, whichrow); }
+
+  std::string formatBaselineParams(const std::vector<float>& params, const std::vector<bool>& fixed, float rms, const std::string& masklist, int whichrow, bool verbose=false)
+  { return table_->formatBaselineParams(params, fixed, rms, masklist, whichrow, verbose); }
+
+  std::string formatPiecewiseBaselineParams(const std::vector<int>& ranges, const std::vector<float>& params, const std::vector<bool>& fixed, float rms, const std::string& masklist, int whichrow, bool verbose=false)
+  { return table_->formatPiecewiseBaselineParams(ranges, params, fixed, rms, masklist, whichrow, verbose); }
 
   bool getFlagtraFast(int whichrow=0) const
-    { return table_->getFlagtraFast(whichrow); }
+  { return table_->getFlagtraFast(whichrow); }
+