Changeset 1930 for trunk

Timestamp:

09/17/10 17:20:14 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

1. Added selector.get_row().
2. Constructor allows to set rows and types.
3. Selection summary string contains SRCTYPE and ROW selection.

Location:

trunk

Files:

• python/selector.py (modified) (3 diffs)
• src/STSelector.cpp (modified) (1 diff)
• src/STSelector.h (modified) (1 diff)
• src/python_STSelector.cpp (modified) (1 diff)

trunk/python/selector.py

@@ -8 +8 @@
     scantables to specific rows.
     """
-    fields = ["pols", "ifs", "beams", "scans", "cycles", "name", "query", "types"]
+    fields = ["pols", "ifs", "beams", "scans", "cycles", "name", "query", "types", "rows"]
 
     def __init__(self, *args, **kw):
@@ -216 +216 @@
     def get_types(self):
         return list(self._gettypes())
+    def get_rows(self):
+        return list(self._getrows())
     def get_query(self):
         prefix = "SELECT FROM $1 WHERE "
@@ -233 +235 @@
              "POLNO": self.get_pols(),
              "QUERY": self.get_query(),
+             "SRCTYPE": self.get_types(),
+             "ROWS": self.get_rows(),
              "Sort Order": self.get_order()
              }

trunk/src/STSelector.cpp

@@ -270 +270 @@
 }
 
+std::vector< int > asap::STSelector::getRows( ) const
+{
+  return rowselection_ ;
+}
+
 std::string asap::STSelector::print( )
 {

trunk/src/STSelector.h

@@ -57 +57 @@
   std::vector<int> getCycles() const;
   std::vector<int> getTypes() const;
+  std::vector<int> getRows() const;
   std::vector<std::string> getPolTypes() const;
   std::string getTaQL() const { return taql_; }

trunk/src/python_STSelector.cpp

@@ -30 +30 @@
         .def("_getcycles", &STSelector::getCycles)
         .def("_gettypes", &STSelector::getTypes)
+        .def("_getrows", &STSelector::getRows)
         .def("_gettaql", &STSelector::getTaQL)
         .def("_getorder", &STSelector::getSortOrder)