Changeset 2773 for trunk/src/STBaselineTable.cpp

Timestamp:

02/25/13 15:49:06 (11 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: Yes

Module(s): sd

Description: optimisation/refactoring the baselining functions for scantable.

File:

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

trunk/src/STBaselineTable.cpp

@@ -137 +137 @@
 }
 
+void STBaselineTable::appenddata(int scanno, int cycleno, 
+                                 int beamno, int ifno, int polno, 
+                                 int freqid, Double time, 
+                                 bool apply, 
+                                 STBaselineFunc::FuncName ftype, 
+                                 int fpar, 
+                                 vector<float> ffpar, 
+                                 Vector<uInt> mask,
+                                 vector<float> res,
+                                 float rms,
+                                 int nchan, 
+                                 float cthres,
+                                 int citer, 
+                                 float lfthres, 
+                                 int lfavg, 
+                                 vector<int> lfedge)
+{
+  vector<int> fparam(1);
+  fparam[0] = fpar;
+
+  appenddata(scanno, cycleno, beamno, ifno, polno, freqid, time,
+             apply, ftype, fparam, ffpar, mask, res, rms, nchan, 
+             cthres, citer, lfthres, lfavg, lfedge);
+}
+
+void STBaselineTable::appenddata(int scanno, int cycleno, 
+                                 int beamno, int ifno, int polno, 
+                                 int freqid, Double time, 
+                                 bool apply, 
+                                 STBaselineFunc::FuncName ftype, 
+                                 vector<int> fpar, 
+                                 vector<float> ffpar, 
+                                 Vector<uInt> mask,
+                                 vector<float> res,
+                                 float rms,
+                                 int nchan, 
+                                 float cthres,
+                                 int citer, 
+                                 float lfthres, 
+                                 int lfavg, 
+                                 vector<int> lfedge)
+{
+  Vector<Int> fparam(fpar.size());
+  for (uInt i = 0; i < fpar.size(); ++i) {
+    fparam[i] = fpar[i];
+  }
+  Vector<uInt> edge(lfedge.size());
+  for (uInt i = 0; i < lfedge.size(); ++i) {
+    edge[i] = lfedge[i];
+  }
+  appenddata(uInt(scanno), uInt(cycleno), uInt(beamno), 
+             uInt(ifno), uInt(polno), uInt(freqid), time,
+             Bool(apply), ftype, fparam, Vector<Float>(ffpar), 
+             mask, Vector<Float>(res), Float(rms), uInt(nchan), 
+             Float(cthres), uInt(citer), 
+             Float(lfthres), uInt(lfavg), edge);
+}
+
 void STBaselineTable::appenddata(uInt scanno, uInt cycleno, 
                                  uInt beamno, uInt ifno, uInt polno,