Changeset 1908

Timestamp:

08/26/10 20:22:18 (14 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-1937, CAS-2373

Ready to Release: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): sdbaseline

Description: Changing some function names

Location:

trunk

Files:

• python/scantable.py (modified) (1 diff)
• src/Scantable.cpp (modified) (4 diffs)
• src/Scantable.h (modified) (1 diff)
• src/ScantableWrapper.h (modified) (1 diff)
• src/python_Scantable.cpp (modified) (1 diff)

trunk/python/scantable.py

@@ -1986 +1986 @@
             if batch:
                 for r in rows:
-                    workscan._poly_baseline(mask, order, r)
+                    workscan._poly_baseline_batch(mask, order, r)
             elif plot:
                 f = fitter()

trunk/src/Scantable.cpp

@@ -1739 +1739 @@
   std::vector<float> spec = getSpectrum(rowno);
   std::vector<bool> fmask = getMask(rowno);
+  if (fmask.size() != mask.size()) {
+    throw(AipsError("different mask sizes"));
+  }
   for (int i = 0; i < fmask.size(); i++) {
     fmask[i] = fmask[i] && mask[i];
@@ -1747 +1750 @@
 }
 
-void Scantable::polyBaseline(const std::vector<bool>& mask, int order, int rowno)
+void Scantable::polyBaselineBatch(const std::vector<bool>& mask, int order, int rowno)
 {
   Fitter fitter = Fitter();
@@ -1778 +1781 @@
   }
 
+  std::vector<bool> fmask = getMask(rowno);
   if (fmask_size != fmask.size()) {
     throw(AipsError("wrong fmask size"));
@@ -1783 +1787 @@
   int *pfmask = reinterpret_cast<int*>(fmask_ptr);
   for (int i = 0; i < fmask_size; i++) {
-    pfmask[i] = (fmask[i] ? 1 : 0);
+    pfmask[i] = ((fmask[i] && mask[i]) ? 1 : 0);
   }
 }

trunk/src/Scantable.h

@@ -489 +489 @@
   bool getFlagtraFast(int whichrow);
 
-  void polyBaseline(const std::vector<bool>& mask, int order, int rowno);
+  void polyBaselineBatch(const std::vector<bool>& mask, int order, int rowno);
   void 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);
 

trunk/src/ScantableWrapper.h

@@ -253 +253 @@
   { table_->polyBaseline(mask, order, rowno, pars_ptr, pars_size, errs_ptr, errs_size, fmask_ptr, fmask_size); }
 
-  void polyBaseline(const std::vector<bool>& mask, int order, int rowno)
-  { table_->polyBaseline(mask, order, rowno); }
+  void polyBaselineBatch(const std::vector<bool>& mask, int order, int rowno)
+  { table_->polyBaselineBatch(mask, order, rowno); }
 
   bool getFlagtraFast(int whichrow=0) const

trunk/src/python_Scantable.cpp

@@ -140 +140 @@
           boost::python::arg("nmax")=-1) )
     .def("_poly_baseline", &ScantableWrapper::polyBaseline)
+    .def("_poly_baseline_batch", &ScantableWrapper::polyBaselineBatch)
     .def("_getflagtrafast", &ScantableWrapper::getFlagtraFast,
          (boost::python::arg("whichrow")=0) )