DM-13886: Simplify Transform to contain a Mapping instead of a FrameSet #340
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
parejkoj
approved these changes
Apr 3, 2018
include/lsst/afw/geom/SkyWcs.h
Outdated
| @@ -405,6 +408,7 @@ class SkyWcs final : public table::io::PersistableFacade<SkyWcs>, public table:: | |||
| */ | |||
| std::shared_ptr<ast::FrameDict> _checkFrameDict(ast::FrameDict const &frameDict) const; | |||
|
|
|||
| std::shared_ptr<const ast::FrameDict> _frameDict; | |||
| std::shared_ptr<const TransformPoint2ToSpherePoint> _transform; | |||
There was a problem hiding this comment.
It's worth having a comment here that explains the relationship between _frameDict and _transform.
include/lsst/afw/geom/Transform.h
Outdated
| * @param[in] mapping ast::Mapping describing the desired transformation | ||
| * @param[in] simplify Simplify the mapping? This combines component mappings | ||
| * and removes redundant components where possible. | ||
| * where it possible to do so without affecting accuracy. |
include/lsst/afw/geom/Transform.h
Outdated
| * redundant components where possible. However it | ||
| * does not remove any frames. | ||
| * @param[in] simplify Simplify the mapping? This combines component mappings | ||
| * where it possible to do so without affecting accuracy. |
There was a problem hiding this comment.
where it is possible...
And should it be indented to match the rest of the docstring block?
python/lsst/afw/geom/testUtils.py
Outdated
| @@ -857,17 +858,10 @@ def checkTransformFromFrameSet(self, fromName, toName): | |||
|
|
|||
| self.checkPersistence(transform) | |||
|
|
|||
| frameSetCopy = transform.getFrameSet() | |||
| transformCopy = TransformClass(frameSetCopy) | |||
| mappingFromFrameSet = transform.getMapping() | |||
There was a problem hiding this comment.
Why is this one called mappingFromFrameSet?
There was a problem hiding this comment.
Good catch. I'll fix it.
| std::ostringstream os; | ||
| os << "TransformBoundedField (containing " << _transform.getFrameSet()->getNFrame() << " frames)"; | ||
| return os.str(); | ||
| return "TransformBoundedField"; |
There was a problem hiding this comment.
I don't know if there's a better way to get some amount more description in this returned string?
There was a problem hiding this comment.
I have not thought of one
| inPointsRoundTrip = transform.applyInverse(outPoints) | ||
| self.assertPairListsAlmostEqual(inPoints, inPointsRoundTrip) | ||
| self.assertSpherePointListsAlmostEqual(wcs1.pixelToSky(inPoints), | ||
| wcs2.pixelToSky(outPoints)) | ||
|
|
||
| def testSameWcs(self): | ||
| """Confirm that pairing two identical Wcs gives an identity transform. | ||
| """ | ||
| for wcs in self.wcsList: | ||
| transform = makeWcsPairTransform(wcs, wcs) | ||
| # check that the transform has been simplified |
There was a problem hiding this comment.
Is this comment still valid? It looks to me that all that's being tested is round-trippinmg, not simplification.
There was a problem hiding this comment.
Agreed. I added such a test
instead of an ast::Mapping and an ast::FrameSet, as per RFC-469. Rename Transform.getFrameSet() to getMapping(). Add an internal ast::FrameDict to SkyWcs, since it was using Transform to store its FrameDict. There are no API changes to SkyWcs. Update and clarify documentation. Update other code and unit tests as needed.
preparatory to fixing a nested namespace definition
to fix a clang compiler warning (nested namespace definitions are a C++17 feature).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.