Changeset 1543

Timestamp:

03/26/09 10:41:07 (16 years ago)

Author:

Malte Marquarding

Message:

merged in bug fixes from trunk

Location:

tags/asap2.3.1

Files:

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

tags/asap2.3.1/python/selector.py

@@ -47 +47 @@
     
     # for the americans
-    set_polarization = set_polarisations
+    set_polarizations = set_polarisations
+    # for the lazy
+    set_pols = set_polarisations
 
     def set_ifs(self, ifs=[]):
@@ -163 +165 @@
         prefix = "SELECT FROM $1 WHERE "
         return self._gettaql().replace(prefix, "")
+
     def get_name(self):
         print "NYI"

tags/asap2.3.1/src/STMathWrapper.h

@@ -174 +174 @@
                                    const std::string& refTime,
                                    const std::string& method  )
-  { return ScantableWrapper(STMath::frequencyAlign(in.getCP())); }
+  { return ScantableWrapper(STMath::frequencyAlign(in.getCP(), refTime, method)); }
 
   ScantableWrapper convertPolarisation( const ScantableWrapper& in,

tags/asap2.3.1/src/STSelector.cpp

@@ -104 +104 @@
 void STSelector::setTaQL( const std::string& taql )
 {
-  taql_ = "USING STYLE PYTHON " + taql;
+  taql_ = taql;
 }
 
@@ -143 +143 @@
   if ( taql_.size() > 0 ) {
     Table tmpt = tab;
+    std::string pytaql = "USING STYLE PYTHON " + taql_;
 
     if ( !query.isNull() ) { // taql and selection
-      tmpt = tableCommand(taql_, tab(query));
+      tmpt = tableCommand(pytaql, tab(query));
     } else { // taql only
-      tmpt = tableCommand(taql_, tab);
+      tmpt = tableCommand(pytaql, tab);
     }
     return sort(tmpt);