Changeset 3043 for trunk

Timestamp:

07/30/15 17:11:36 (9 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Optimize cubic spline fitting in Scantable::subBaseline.
I expect that the performance will improve about 30%.

Location:

trunk/src

Files:

• Scantable.cpp (modified) (1 diff)
• Scantable.h (modified) (2 diffs)

trunk/src/Scantable.cpp

@@ -2783 +2783 @@
     res = doChebyshevFitting(spec, mask, fpar[0], params, rms, finalmask, clipth, clipn);
   } else if (ftype == STBaselineFunc::CSpline) {
+    int nclip = 0;
+    size_t numChan = spec.size();
+    if (cubicSplineModelPool_.find(numChan) == cubicSplineModelPool_.end()) {
+      cubicSplineModelPool_[numChan] = getPolynomialModel(3, numChan, &Scantable::getNormalPolynomial);
+    }
     if (fpar.size() > 1) { // reading from baseline table in which pieceEdges are already calculated and stored.
-      res = doCubicSplineFitting(spec, mask, fpar, params, rms, finalmask, clipth, clipn);
+      //res = doCubicSplineFitting(spec, mask, fpar, params, rms, finalmask, clipth, clipn);
+      res = doCubicSplineLeastSquareFitting(spec, mask,
+                                            cubicSplineModelPool_[numChan],
+                                            fpar.size()-1, true, fpar, params,
+                                            rms, finalmask, nclip, clipth,
+                                            clipn);
     } else {               // usual cspline fitting by giving nPiece only. fpar will be replaced with pieceEdges. 
-      res = doCubicSplineFitting(spec, mask, fpar[0], fpar, params, rms, finalmask, clipth, clipn);
+      //res = doCubicSplineFitting(spec, mask, fpar[0], fpar, params, rms, finalmask, clipth, clipn);
+      res = doCubicSplineLeastSquareFitting(spec, mask,
+                                            cubicSplineModelPool_[numChan],
+                                            fpar[0], false, fpar, params,
+                                            rms, finalmask, nclip, clipth,
+                                            clipn);
     }
   } else if (ftype == STBaselineFunc::Sinusoid) {

trunk/src/Scantable.h

@@ -19 +19 @@
 #include <string>
 #include <vector>
+#include <map>
 // AIPS++
 #include <casa/aips.h>
@@ -993 +994 @@
  std::vector<float> doSubtractBaseline(std::vector<float>& spec, std::vector<bool>& mask, const STBaselineFunc::FuncName ftype, std::vector<int>& fpar, std::vector<float>& params, float&rms, std::vector<bool>& finalmask, float clipth, int clipn, bool uself, int irow, float lfth, std::vector<int>& lfedge, int lfavg);
 
+ // storage of cubic spline model for various number of channels
+ map<size_t, vector< vector<double> > > cubicSplineModelPool_;
+
 };
 } // namespace