Changeset 1924 for branches/polybatch/src/Scantable.cpp

Timestamp:

09/14/10 12:17:16 (14 years ago)

Author:

Malte Marquarding

Message:

Ticket #206: use STFitEntry as return objetc instead of pointer wrnagling.

File:

• branches/polybatch/src/Scantable.cpp (modified) (1 diff)

branches/polybatch/src/Scantable.cpp

@@ -1750 +1750 @@
 }
 
-void Scantable::polyBaselineBatch(const std::vector<bool>& mask, int order, int rowno)
+void Scantable::polyBaselineBatch(const std::vector<bool>& mask, int order)
+{
+  Fitter fitter = Fitter();
+  for (uInt rowno=0; rowno < nrow(); ++rowno) {
+    doPolyBaseline(mask, order, rowno, fitter);
+    setSpectrum(fitter.getResidual(), rowno);
+  }
+}
+
+STFitEntry 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, long pars_ptr, long pars_size, long errs_ptr, long errs_size, long fmask_ptr, long 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];
-  }
-
-  std::vector<bool> fmask = getMask(rowno);
-  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] && mask[i]) ? 1 : 0);
-  }
+  return fitter.getFitEntry();
 }