-
Notifications
You must be signed in to change notification settings - Fork 48
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
Spring cleaning coordinate frames #457
base: master
Are you sure you want to change the base?
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #457 +/- ##
==========================================
+ Coverage 87.42% 87.69% +0.26%
==========================================
Files 22 22
Lines 3874 3901 +27
==========================================
+ Hits 3387 3421 +34
+ Misses 487 480 -7 ☔ View full report in Codecov by Sentry. |
cb649e2
to
ee6a91b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is still very WIP.
For today, I have been focusing on what is needed to remove the CoordinateFrame
methods coordinates()
and coordinate_to_quantity
as we should be able to use the Astropy wcsapi infrastructure to do those conversions for us now.
To this end, I started cleaning up the transform APIs (as users of those methods). I have added private _call_forward
and _call_backward
methods which only handle the old with_units=False
case.
There appear to be multiple inconsistencies in how Quantity & high level objects were handled in various places around the API, it seems we were a lot more permissive than the docs stated, and would convert pretty much anything. I have maintained the ability to call the transforms with or without quantity irrespective of if the underlying model uses quantity or not.
After all this I have a question: There is clearly need to keep a more flexible API than the APE 14 API to handle kwargs being passed through to the transform or to control the numerical inverse. Should we continue to use with_units=
as a way to differentiate the high and low level object inputs/outputs, or should we have separate methods like APE 14?
217807e
to
88a39d0
Compare
I am going to split this up. |
96f0464
to
e0aa648
Compare
4849e01
to
846b0cf
Compare
This adds back a more sane equivalent of coordinates and coordinates_to_quantity.
36ee0f5
to
1b7871b
Compare
Well that was an un-fun merge. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are some failing tests downstream but my understanding is that some have been explained and others are being fixed by @WilliamJamieson
LGTM. Thanks!
This PR has been going on for a long time, but I think it's finally close. So here's a write up of what this PR does and why based on what I can remember and my own review of the code.
Objective
Ultimately this whole thing span out of trying to fix #455, which boils down to
axes_order
and the way frames worked being inconsistent and weird. So the primary objective of this PR is to clarify, fix and document the purpose of the frames and how they interact with the WCS class and WCS API.Core changes
Coordinate Frame Ordering
The coordinate frames now have a "native" order of axes, the main one where this is apparent is
CelestialFrame
where the native order is lon, lat. The__init__
for frames is always in the native order, and a different effective order can be given usingaxes_order
. The native ordering of a frame is then passed into aFrameProperties
class, and properties on the frame itself return an ordered view into this class. This functionality is tested hereThis split between native and axes_order ordering is also used by
CompositeFrame
to allow it to combine split axes ordering into the expected order. This is tested hereHigh Level Objects and Units
The other main change is to the handling of units and high level objects. This has a few smaller prongs to it.
Firstly, this PR codifies that
with_units
controls the return type of__call__
inverse
andtransform
, ifwith_units=True
then high level astropy objects (Quantity, SkyCoord, Time etc) will be returned. All high level object handling is now confined to these user facing methods, and numerical only (Quantity or non-Quantity) transforms are executed by the new_call_forward
and_call_backward
methods.Secondly, this PR also codifies and refactors the input handling for all these methods. Quantity and non-Quantity inputs are always supported for forward transforms, and depending on the
transform.uses_quantity
property on theModel
the units will be retained, added or stripped as needed. All this happens in the new_call_forward
and_call_backward
methods.Finally, to align with the new
_call_backward
methodWCS.numerical_inverse
is now low-level only, it can no longer accept high-level objects to be type converted by the frames, and will not return them either. If you need this functionality it will be automatically handled byinverse
. (with_units=True
tonumerical_inverse
now raises an exception).Use more high level object handling from astropy core
The final major change in this PR is to remove as much high level WCS API code as possible and rely on astropy to do this for us. This consists of two main parts:
Using
HighLevelWCSMixin
The
GWCSAPIMixin
now inherits from theHighLevelWCSMixin
and no longer implements the high level API as this is provided by the mixin.Removing custom high <> low level object conversion
We now use
high_level_objects_to_values
andvalues_to_high_level_objects
fromastropy.wcs.wcsapi.high_level_api
to convert to/from high level objects when they are passed to the user facing methods or to return them from these methods whenwith_units=True
.The combination of these two changes means that we no longer need to implement low-level <> high-level conversions on the coordinate frame classes, so the
coordinates
andcoordinate_to_quantity
methods have been removed.Breaking changes:
WCS.numerical_inverse
no longer handles high level inputs or outputs,with_units=True
errors.CoordinateFrame.coordinates
and.coordinate_to_quantity
have been removed, these should never really have been used by users.CelestialFrame
should always be in lon,lat order and will be re-ordered by axes_order. This behaviour before was poorly specified and inconsistent.Open Questions
RegionSelector seems to not propagateuses_quantity
correctly: Spring cleaning coordinate frames #457 (comment)fixes #224
hopefully fixes #269