Changeset 1543 for tags


Ignore:
Timestamp:
03/26/09 10:41:07 (15 years ago)
Author:
Malte Marquarding
Message:

merged in bug fixes from trunk

Location:
tags/asap2.3.1
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • tags/asap2.3.1/python/selector.py

    r1349 r1543  
    4747   
    4848    # for the americans
    49     set_polarization = set_polarisations
     49    set_polarizations = set_polarisations
     50    # for the lazy
     51    set_pols = set_polarisations
    5052
    5153    def set_ifs(self, ifs=[]):
     
    163165        prefix = "SELECT FROM $1 WHERE "
    164166        return self._gettaql().replace(prefix, "")
     167
    165168    def get_name(self):
    166169        print "NYI"
  • tags/asap2.3.1/src/STMathWrapper.h

    r1391 r1543  
    174174                                   const std::string& refTime,
    175175                                   const std::string& method  )
    176   { return ScantableWrapper(STMath::frequencyAlign(in.getCP())); }
     176  { return ScantableWrapper(STMath::frequencyAlign(in.getCP(), refTime, method)); }
    177177
    178178  ScantableWrapper convertPolarisation( const ScantableWrapper& in,
  • tags/asap2.3.1/src/STSelector.cpp

    r1428 r1543  
    104104void STSelector::setTaQL( const std::string& taql )
    105105{
    106   taql_ = "USING STYLE PYTHON " + taql;
     106  taql_ = taql;
    107107}
    108108
     
    143143  if ( taql_.size() > 0 ) {
    144144    Table tmpt = tab;
     145    std::string pytaql = "USING STYLE PYTHON " + taql_;
    145146
    146147    if ( !query.isNull() ) { // taql and selection
    147       tmpt = tableCommand(taql_, tab(query));
     148      tmpt = tableCommand(pytaql, tab(query));
    148149    } else { // taql only
    149       tmpt = tableCommand(taql_, tab);
     150      tmpt = tableCommand(pytaql, tab);
    150151    }
    151152    return sort(tmpt);
Note: See TracChangeset for help on using the changeset viewer.