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-13898: Remove the XYTransform classes #344

Merged
merged 1 commit into from
Apr 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions include/lsst/afw/geom.h
Expand Up @@ -39,9 +39,6 @@
#include "lsst/afw/geom/Span.h"
#include "lsst/afw/geom/SpanSet.h"
#include "lsst/afw/geom/SpherePoint.h"
#include "lsst/afw/geom/XYTransform.h"
#include "lsst/afw/geom/Functor.h"
#include "lsst/afw/geom/SeparableXYTransform.h"
#include "lsst/afw/geom/polygon/Polygon.h"
#include "lsst/afw/geom/Endpoint.h"
#include "lsst/afw/geom/Transform.h"
Expand Down
121 changes: 0 additions & 121 deletions include/lsst/afw/geom/Functor.h

This file was deleted.

102 changes: 0 additions & 102 deletions include/lsst/afw/geom/SeparableXYTransform.h

This file was deleted.

9 changes: 2 additions & 7 deletions include/lsst/afw/geom/SpanSet.h
Expand Up @@ -36,6 +36,7 @@
#include "lsst/afw/image/Mask.h"
#include "lsst/afw/table/io/Persistable.h"
#include "lsst/afw/geom/ellipses/Ellipse.h"
#include "lsst/afw/geom/ellipses/Quadrupole.h"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see the use of ellipses::Quadrupole below, but I don't see anything you did that would require adding this header. Was this broken before?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This include should have been there all along. I'm not sure how Quadrupole was getting included before, but I assume it was via some indirect path involving XYTransform.

#include "lsst/afw/geom/SpanSetFunctorGetters.h"
#include "lsst/afw/geom/Transform.h"
#include "lsst/afw/image/Image.h"
Expand Down Expand Up @@ -216,17 +217,11 @@ class SpanSet : public afw::table::io::PersistableFacade<lsst::afw::geom::SpanSe
*/
std::shared_ptr<SpanSet> transformedBy(AffineTransform const &t) const;

/** Return a new SpanSet who's pixels are the product of applying the specified transformation
*
* @param t A XY transform object which will be used to map the pixels
*/
std::shared_ptr<SpanSet> transformedBy(XYTransform const &t) const;

/** Return a new SpanSet who's pixels are the product of applying the specified transformation
*
* @param t A 2-D transform which will be used to map the pixels
*/
std::shared_ptr<SpanSet> transformedBy(Transform<Point2Endpoint, Point2Endpoint> const &t) const;
std::shared_ptr<SpanSet> transformedBy(TransformPoint2ToPoint2 const &t) const;

/** Specifies if this SpanSet overlaps with another SpanSet
*
Expand Down
1 change: 0 additions & 1 deletion include/lsst/afw/geom/SpanSetFunctorGetters.h
Expand Up @@ -30,7 +30,6 @@
#include <type_traits>
#include "lsst/afw/geom/Span.h"
#include "lsst/afw/geom/Point.h"
#include "lsst/afw/geom/XYTransform.h"
#include "lsst/afw/image/Image.h"
#include "lsst/afw/image/Mask.h"
#include "lsst/pex/exceptions.h"
Expand Down