Changeset 2888 for trunk

Timestamp:

12/26/13 13:21:30 (11 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-5860)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: Added scantable a method, asap.scantable.._get_root_row_idx(), and underlying c++ functions, ScantableWrapper:::getRootTableRowNumbers() and Scantable:::getRootTableRowNumbers()

Test Programs: TBD

Put in Release Notes: No

Module(s): asap.scantable and CASA task, tsdstat

Description:

Added a scantable method, asap.scantable._get_root_row_idx().
The method returns row indices (uint std::vecotr) in the root table for selected rows of scantable.

Location:

trunk/src

Files:

• Scantable.cpp (modified) (1 diff)
• Scantable.h (modified) (1 diff)
• ScantableWrapper.h (modified) (1 diff)
• python_Scantable.cpp (modified) (1 diff)

trunk/src/Scantable.cpp

@@ -5230 +5230 @@
 
 
+std::vector<uint> Scantable::getRootTableRowNumbers() const
+{
+  Vector<uInt> rowIds(table_.rowNumbers());
+  vector<uint> res;
+  rowIds.tovector(res);
+  return res;
+}
+
+
 void Scantable::dropXPol()
 {

trunk/src/Scantable.h

@@ -648 +648 @@
   std::vector<uint> getMoleculeIdColumnData() const;
   void setMoleculeIdColumnData(const std::vector<uint>& molids);
+
+  /**
+   * Get row idx of root table
+   **/
+  std::vector<uint> getRootTableRowNumbers() const;
+
   double calculateModelSelectionCriteria(const std::string& valname,
                                          const std::string& blfunc,

trunk/src/ScantableWrapper.h

@@ -337 +337 @@
   void setMoleculeIdColumnData(const std::vector<uint>& molids)
   { table_->setMoleculeIdColumnData(molids); }
+
+  std::vector<uint> getRootTableRowNumbers() const
+  { return table_->getRootTableRowNumbers(); }
+
   double calculateModelSelectionCriteria(const std::string& valname, const std::string& blfunc, int order, const std::vector<bool>& inMask, int whichrow, bool useLineFinder, const std::vector<int>& edge, float threshold, int chanAvgLimit)
   { return table_->calculateModelSelectionCriteria(valname, blfunc, order, inMask, whichrow, useLineFinder, edge, threshold, chanAvgLimit); }

trunk/src/python_Scantable.cpp

@@ -169 +169 @@
     .def("_getmolidcol_list", &ScantableWrapper::getMoleculeIdColumnData)
     .def("_setmolidcol_list", &ScantableWrapper::setMoleculeIdColumnData)
+    .def("_get_root_row_idx", &ScantableWrapper::getRootTableRowNumbers)
     .def("_calc_aic", &ScantableWrapper::calculateModelSelectionCriteria)
     .def("drop_xpol", &ScantableWrapper::dropXPol)