Changeset 1930


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/python/selector.py

    r1927 r1930  
    88    scantables to specific rows.
    99    """
    10     fields = ["pols", "ifs", "beams", "scans", "cycles", "name", "query", "types"]
     10    fields = ["pols", "ifs", "beams", "scans", "cycles", "name", "query", "types", "rows"]
    1111
    1212    def __init__(self, *args, **kw):
     
    216216    def get_types(self):
    217217        return list(self._gettypes())
     218    def get_rows(self):
     219        return list(self._getrows())
    218220    def get_query(self):
    219221        prefix = "SELECT FROM $1 WHERE "
     
    233235             "POLNO": self.get_pols(),
    234236             "QUERY": self.get_query(),
     237             "SRCTYPE": self.get_types(),
     238             "ROWS": self.get_rows(),
    235239             "Sort Order": self.get_order()
    236240             }
  • trunk/src/STSelector.cpp

    r1819 r1930  
    270270}
    271271
     272std::vector< int > asap::STSelector::getRows( ) const
     273{
     274  return rowselection_ ;
     275}
     276
    272277std::string asap::STSelector::print( )
    273278{
  • trunk/src/STSelector.h

    r1819 r1930  
    5757  std::vector<int> getCycles() const;
    5858  std::vector<int> getTypes() const;
     59  std::vector<int> getRows() const;
    5960  std::vector<std::string> getPolTypes() const;
    6061  std::string getTaQL() const { return taql_; }
  • trunk/src/python_STSelector.cpp

    r1819 r1930  
    3030        .def("_getcycles", &STSelector::getCycles)
    3131        .def("_gettypes", &STSelector::getTypes)
     32        .def("_getrows", &STSelector::getRows)
    3233        .def("_gettaql", &STSelector::getTaQL)
    3334        .def("_getorder", &STSelector::getSortOrder)
Note: See TracChangeset for help on using the changeset viewer.