Changeset 1907 for trunk/src/Scantable.cpp

Timestamp:

08/26/10 19:46:26 (14 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-1937,CAS-2373

Ready to Release: Yes

Interface Changes: Yes

What Interface Changed: A new parameter 'batch' was added to

sd.scantable.poly_baseline(), while
'uselin' was removed.

Test Programs:

Put in Release Notes: Yes

Module(s): sdbaseline

Description: A faster version of sd.scantable.poly_baseline().

File:

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

trunk/src/Scantable.cpp

@@ -1712 +1712 @@
 }
 
+bool Scantable::getFlagtraFast(int whichrow)
+{
+  uChar flag;
+  Vector<uChar> flags;
+  flagsCol_.get(uInt(whichrow), flags);
+  for (int i = 0; i < flags.size(); i++) {
+    if (i==0) {
+      flag = flags[i];
+    }
+    else {
+      flag &= flags[i];
+    }
+    return ((flag >> 7) == 1);
+   }
+}
+
+void Scantable::doPolyBaseline(const std::vector<bool>& mask, int order, int rowno, Fitter& fitter)
+{
+  fitter.setExpression("poly", order);
+
+  std::vector<double> abcsd = getAbcissa(rowno);
+  std::vector<float> abcs;
+  for (int i = 0; i < abcsd.size(); i++) {
+    abcs.push_back((float)abcsd[i]);
+  }
+  std::vector<float> spec = getSpectrum(rowno);
+  std::vector<bool> fmask = getMask(rowno);
+  for (int i = 0; i < fmask.size(); i++) {
+    fmask[i] = fmask[i] && mask[i];
+  }
+  fitter.setData(abcs, spec, fmask);
+
+  fitter.lfit();
+}
+
+void Scantable::polyBaseline(const std::vector<bool>& mask, int order, int rowno)
+{
+  Fitter fitter = Fitter();
+  doPolyBaseline(mask, order, rowno, fitter);
+  setSpectrum(fitter.getResidual(), rowno);
+}
+
+void Scantable::polyBaseline(const std::vector<bool>& mask, int order, int rowno, int pars_ptr, int pars_size, int errs_ptr, int errs_size, int fmask_ptr, int fmask_size)
+{
+  Fitter fitter = Fitter();
+  doPolyBaseline(mask, order, rowno, fitter);
+  setSpectrum(fitter.getResidual(), rowno);
+
+  std::vector<float> pars = fitter.getParameters();
+  if (pars_size != pars.size()) {
+    throw(AipsError("wrong pars size"));
+  }
+  float *ppars = reinterpret_cast<float*>(pars_ptr);
+  for (int i = 0; i < pars_size; i++) {
+    ppars[i] = pars[i];
+  }
+
+  std::vector<float> errs = fitter.getErrors();
+  if (errs_size != errs.size()) {
+    throw(AipsError("wrong errors size"));
+  }
+  float *perrs = reinterpret_cast<float*>(errs_ptr);
+  for (int i = 0; i < errs_size; i++) {
+    perrs[i] = errs[i];
+  }
+
+  if (fmask_size != fmask.size()) {
+    throw(AipsError("wrong fmask size"));
+  }
+  int *pfmask = reinterpret_cast<int*>(fmask_ptr);
+  for (int i = 0; i < fmask_size; i++) {
+    pfmask[i] = (fmask[i] ? 1 : 0);
+  }
+}
+
 }
 //namespace asap