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.

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

DM-833: implement coaddition for aperture corrections #12

Merged
merged 7 commits into from Aug 13, 2015
Merged

Conversation

r-owen
Copy link
Contributor

@r-owen r-owen commented Aug 7, 2015

No description provided.

TallJimbo and others added 7 commits August 6, 2015 16:54
Conflicts:
	include/lsst/meas/algorithms.h
	python/lsst/meas/algorithms/algorithmsLib.i

These conflicts were primarily due to LSST moving many things
to meas_base. However, the HSC version of algorithmsLib.i also
mentions BinnedWcs, an object that LSST doesn't yet have
and may require.
This also includes the following commit:
commit 6b5c958
Author: Paul Price <price@astro.princeton.edu>
Date:   Fri Aug 1 17:21:53 2014 -0400

    CoaddBoundedField: fix swig for std::vector<CoaddBoundedFieldElement>

    The %ignore and %template were after the %include, so swig wasn't
    recognising them.  The correct order for swig to recognise and parse
    a std::vector<Foo> is:

    %ignore std::vector<Foo>::vector(size_type);// required if no default Ctor
    %ignore std::vector<Foo>::resize;// required if no default Ctor
    %template(VectorFoo) std::vector<Foo>;
    %include "Foo.h"
This is required following the addition of a pure virtual operator*
in the parent class, BoundedField, in afw.
Remove unused imports and one variable that was assigned to
but never touched again.
@r-owen r-owen changed the title Tickets/dm 833 DM-833: implement coaddition for aperture corrections Aug 7, 2015
@r-owen r-owen merged commit 9caa038 into master Aug 13, 2015
@ktlim ktlim deleted the tickets/DM-833 branch August 25, 2018 06:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants