Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-18314: reduce namespace confusion for matchOptimisticB #116

Merged
merged 2 commits into from
Mar 9, 2019
Merged

DM-18314: reduce namespace confusion for matchOptimisticB #116

merged 2 commits into from
Mar 9, 2019

Commits on Mar 9, 2019

  1. reduce namespace confusion for matchOptimisticB 

    The 'matchOptimisticB' namespace is overloaded, which makes it
impossible to do:
    import lsst.meas.astrom.matchOptimisticB.matchOptimisticBContinued
    lsst.meas.astrom.matchOptimisticB.matchOptimisticBContinued.MatchOptimisticBTask
results in:
    AttributeError: 'builtin_function_or_method' object has no attribute 'matchOptimisticBContinued'

The 'matchOptimisticB' module contains a function called
'matchOptimisticB' which was being imported over the top of the
module, so leave it in the module. Move the MatchOptimisticBTask
from the 'matchOptimisticB' module so it can be accessed
without problems. Added a test that detects the problem.
    @PaulPrice
    PaulPrice committed Mar 9, 2019
    Configuration menu
    Copy the full SHA
    07d896c View commit details
    Browse the repository at this point in the history

  2. fix clang++ warning 

    src/sip/CreateWcsWithSip.cc: In constructor 'lsst::meas::astrom::sip::CreateWcsWithSip<MatchT>::CreateWcsWithSip(const std::vector<T>&, const lsst::afw::geom::SkyWcs&, int, const lsst::geom::Box2I&, int)':
src/sip/CreateWcsWithSip.cc:145:46: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
     if (_bbox.isEmpty() && !_matches.empty() > 0) {
                                              ^

Looks like a '_matches.size() > 0' was only half-changed to
'!_matches.empty()'.
    @PaulPrice
    PaulPrice committed Mar 9, 2019
    Configuration menu
    Copy the full SHA
    33f1e6a View commit details
    Browse the repository at this point in the history