Changeset 954

Timestamp:

03/30/06 17:27:42 (18 years ago)

Author:

mar637

Message:

Fixed Ticket #6 (selector.set_polarisations error)

Location:

trunk

Files:

• python/selector.py (modified) (1 diff)
• src/STSelector.cpp (modified) (2 diffs)

trunk/python/selector.py

@@ -37 +37 @@
 
         """
-        vec = _to_list(pols, str) and _to_list(pols, int)
+        vec = _to_list(pols, str) or _to_list(pols, int)
         if vec: # is an empty and/or valid vector
             if len(vec) and isinstance(vec[-1],str):
-                self._setpolstrings(self, vec)
+                self._setpolstrings(vec)
                 return
             self._setpols(vec)

trunk/src/STSelector.cpp

@@ -44 +44 @@
     this->stringselections_ = other.stringselections_;
     this->taql_ = other.taql_;
+    this->poltypes_ = other.poltypes_;
+    this->order_ = other.order_;
   }
   return *this;
@@ -70 +72 @@
 {
   setint("POLNO", pols);
+  poltypes_ = std::vector<std::string>();
 }