Changeset 939 for trunk

Timestamp:

03/30/06 15:32:28 (19 years ago)

Author:

mar637

Message:

added get functions

Location:

trunk/src

Files:

• STSelector.cpp (modified) (5 diffs)
• STSelector.h (modified) (2 diffs)
• python_STSelector.cpp (modified) (2 diffs)

trunk/src/STSelector.cpp

@@ -33 +33 @@
   intselections_(other.intselections_),
   stringselections_(other.stringselections_),
-  taql_(other.taql_) {
+  taql_(other.taql_),
+  poltypes_(other.poltypes_),
+  order_(other.order_) {
 }
 
@@ -153 +155 @@
 }
 
-std::vector< int > STSelector::getint( const std::string& key )
+std::vector< int > STSelector::getint( const std::string& key ) const
 {
   if (intselections_.count(key) > 0) {
@@ -161 +163 @@
 }
 
-std::vector< int > STSelector::getScans( )
+std::vector< int > STSelector::getScans( ) const
 {
   return getint("SCANNO");
 }
 
-std::vector< int > STSelector::getBeams( )
+std::vector< int > STSelector::getBeams( ) const
 {
   return getint("BEAMNO");
 }
 
-std::vector< int > STSelector::getIFs( )
+std::vector< int > STSelector::getIFs( ) const
 {
   return getint("IFNO");
 }
 
-std::vector< int > STSelector::getPols( )
+std::vector< int > STSelector::getPols( ) const
 {
   return getint("POLNO");
 }
 
-std::vector< int > asap::STSelector::getCycles( )
+std::vector< int > asap::STSelector::getCycles( ) const
 {
   return getint("CYCLENO");
@@ -226 +228 @@
 {
   if (order_.nelements() > 0) {
-    cout << "sorting" << endl;
     Table t = tab.sort(order_);
     return t;
@@ -254 +255 @@
 }
 
-std::vector< std::string > asap::STSelector::getPolTypes( )
+std::vector< std::string > asap::STSelector::getPolTypes( ) const
 {
   return poltypes_;
 }
+
+std::vector<std::string> asap::STSelector::getSortOrder() const
+{
+  std::vector<std::string> out;
+  for (uInt i=0;i<order_.nelements(); ++i)
+    out.push_back(order_[i]);
+  return out;
+}

trunk/src/STSelector.h

@@ -49 +49 @@
   void setSortOrder(const std::vector<std::string>& order);
 
-  std::vector<int> getScans();
-  std::vector<int> getBeams();
-  std::vector<int> getIFs();
-  std::vector<int> getPols();
-  std::vector<int> getCycles();
-  std::vector<std::string> getPolTypes();
+  std::vector<int> getScans() const;
+  std::vector<int> getBeams() const;
+  std::vector<int> getIFs() const;
+  std::vector<int> getPols() const;
+  std::vector<int> getCycles() const;
+  std::vector<std::string> getPolTypes() const;
+  std::string getTaQL() const { return taql_; }
+  std::vector<std::string> getSortOrder() const;
 
   casa::Table apply(const casa::Table& tab);
@@ -66 +68 @@
 
 protected:
-  std::vector< int > getint( const std::string& key);
-  std::vector< std::string > getstring( const std::string& key);
+  std::vector< int > getint( const std::string& key) const;
+  //std::vector< std::string > getstring( const std::string& key) const;
 
   void setint(const std::string& key, const std::vector< int >& val);

trunk/src/python_STSelector.cpp

@@ -22 +22 @@
       class_<STSelector>("selector")
         .def( init <> () )
+        .def( init < const STSelector& > () )
         .def("_getbeams", &STSelector::getBeams)
         .def("_getifs", &STSelector::getIFs)
@@ -28 +29 @@
         .def("_getscans", &STSelector::getScans)
         .def("_getcycles", &STSelector::getCycles)
+        .def("_gettaql", &STSelector::getTaQL)
+        .def("_getorder", &STSelector::getSortOrder)
         .def("_reset", &STSelector::reset)
         .def("_setbeams", &STSelector::setBeams)