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

Coordinate fixes #305

Merged
merged 38 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
3ad0906
Update test wcs to use gwcs 0.19 stokes numbers
Cadair Oct 4, 2023
6dcb627
pin newer gwcs
Cadair Oct 4, 2023
6432b48
experiments in no slit VCTs
Cadair Oct 6, 2023
7937fda
Fix some test because of affine changes
Cadair Oct 8, 2023
7052822
First pass at replacing Slit classes with a mapping
Cadair Oct 8, 2023
9646e48
Make tests not error on collection
Cadair Oct 8, 2023
31e7823
Ensure we ref the transform schema
Cadair Oct 16, 2023
21338e3
Add conveter for asymmetric mapping
Cadair Oct 16, 2023
8af396d
isort
Cadair Oct 16, 2023
e172f12
Require astropy 5.3
Cadair Oct 16, 2023
c8072f7
Actually make the new converter work
Cadair Oct 17, 2023
0b178ba
TMP: Add the model_to_graphviz script for debug reasons
Cadair Oct 17, 2023
ca2a459
More AsymmetricMapping fixes
Cadair Oct 17, 2023
acf560b
TMP: Use corresponding branches of inventory and simulator
Cadair Oct 17, 2023
06440bb
Update minimum deps so things actually work
Cadair Oct 17, 2023
d2357af
Add an ASDF file for testing old VCTs
Cadair Oct 19, 2023
464cd66
Fix serialise of AsymmetricMapping
Cadair Oct 20, 2023
fc43e69
More test nonsense
Cadair Oct 20, 2023
4aa18e5
Update the VCT tag versions
Cadair Oct 20, 2023
33d9663
lint
Cadair Oct 20, 2023
edd35ba
Exclude model to graphviz from coverage
Cadair Oct 20, 2023
8234e24
More coverage fixes
Cadair Oct 20, 2023
abad700
Add changelogs
Cadair Oct 20, 2023
f041dde
Add tests for AsymmetricMapping
Cadair Oct 20, 2023
7d1eb5e
Test validation of slit range
Cadair Oct 20, 2023
b0ebccc
More cov
Cadair Oct 20, 2023
8dd9c82
Change the ordering of rotate and scale in the generated models
Cadair Oct 20, 2023
4ce98dc
ignore a warning for old asdf
Cadair Oct 20, 2023
fa241b0
coverage??
Cadair Oct 20, 2023
f4ab7af
Only do pixel to world on new gwcs
Cadair Oct 20, 2023
7e359c4
Merge branch 'main' into visp_wcs
Cadair Oct 23, 2023
5448526
Put a hack in the dataset loader to fix old stokes tables
Cadair Oct 23, 2023
a3fbd40
Add a dataset 1.2.0 tag
Cadair Oct 23, 2023
44e00b8
Apply suggestions from code review
Cadair Oct 26, 2023
b9a7d12
Apply suggestions from code review
Cadair Oct 27, 2023
b3eb80c
Remove inventory / simulator dep and gzip compress file
Cadair Oct 27, 2023
2dbaf55
Run doc build on 3.10
Cadair Oct 27, 2023
6a45926
pin down jsonschema to test oldest deps
Cadair Oct 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -227,3 +227,4 @@ figure_test_images*

# Release script
.github_cache
requirements-min.txt
1 change: 1 addition & 0 deletions changelog/305.breaking.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
We now require gwcs 0.19+ and therefore astropy 5.3+
1 change: 1 addition & 0 deletions changelog/305.bugfix.1.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix the oversight that when generating a model for a celestial WCS the scale model was put before the affine transform in the pipeline. This means that the units for the affine transform matrix provided to ``VaryingCelestialTransform`` and ``generate_celestial_transform`` should be pixels not degrees.
Cadair marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions changelog/305.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix missing references to parent transform schemas in ``Ravel`` and ``VaryingCelestialTransform`` ASDF schemas.
1 change: 1 addition & 0 deletions changelog/305.feature.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add a new ``AsymmetricMapping`` model to allow a different mapping in the forward and reverse directions.
1 change: 1 addition & 0 deletions changelog/305.internal.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove all ``*Slit`` varying celestial transform models and replace them with a compound model combining a ``VaryingCelestialTransform`` and an ``AsymmetricMapping``.
2 changes: 1 addition & 1 deletion dkist/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def generate_lookup_table(lookup_table, interpolation='linear', points_unit=u.pi
@pytest.fixture
def identity_gwcs_5d_stokes(identity_gwcs_4d):
stokes_frame = cf.StokesFrame(axes_order=(4,))
stokes_model = generate_lookup_table([0, 1, 2, 3] * u.one, interpolation='nearest')
stokes_model = generate_lookup_table([1, 2, 3, 4] * u.one, interpolation='nearest')
transform = identity_gwcs_4d.forward_transform
frame = cf.CompositeFrame(identity_gwcs_4d.output_frame.frames + [stokes_frame])

Expand Down
138 changes: 69 additions & 69 deletions dkist/data/test/EIT/eit_test_dataset.asdf
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,41 @@
%TAG ! tag:stsci.edu:asdf/
--- !core/asdf-1.1.0
asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf',
name: asdf, version: 2.14.3}
name: asdf, version: 2.15.2}
history:
extensions:
- !core/extension_metadata-1.0.0
extension_class: asdf.extension.BuiltinExtension
software: !core/software-1.0.0 {name: asdf, version: 2.14.3}
software: !core/software-1.0.0 {name: asdf, version: 2.15.2}
- !core/extension_metadata-1.0.0
extension_class: asdf.extension._manifest.ManifestExtension
extension_uri: asdf://astropy.org/astropy/extensions/astropy-1.0.0
software: !core/software-1.0.0 {name: asdf-astropy, version: 0.3.0}
extension_uri: asdf://asdf-format.org/astronomy/gwcs/extensions/gwcs-1.1.0
software: !core/software-1.0.0 {name: gwcs, version: 0.19.1.dev19+g50e2340}
- !core/extension_metadata-1.0.0
extension_class: asdf.extension._manifest.ManifestExtension
extension_uri: asdf://asdf-format.org/astronomy/gwcs/extensions/gwcs-1.0.0
software: !core/software-1.0.0 {name: gwcs, version: 0.18.3}
extension_uri: asdf://astropy.org/astropy/extensions/astropy-1.0.0
software: !core/software-1.0.0 {name: asdf-astropy, version: 0.4.0}
- !core/extension_metadata-1.0.0
extension_class: asdf.extension._manifest.ManifestExtension
extension_uri: asdf://dkist.nso.edu/dkist/extensions/dkist-1.0.0
software: !core/software-1.0.0 {name: dkist, version: 1.0.0b10.dev10+g5493c6f}
extension_class: asdf_astropy._manifest.CompoundManifestExtension
extension_uri: asdf://asdf-format.org/core/extensions/core-1.5.0
software: !core/software-1.0.0 {name: asdf-astropy, version: 0.4.0}
- !core/extension_metadata-1.0.0
extension_class: asdf.extension._manifest.ManifestExtension
extension_uri: asdf://asdf-format.org/core/extensions/core-1.5.0
software: !core/software-1.0.0 {name: asdf-astropy, version: 0.3.0}
extension_uri: asdf://dkist.nso.edu/dkist/extensions/dkist-1.0.0
software: !core/software-1.0.0 {name: dkist, version: 1.0.2.dev19+g1224aa5.d20231020}
- !core/extension_metadata-1.0.0
extension_class: asdf.extension._manifest.ManifestExtension
extension_uri: asdf://asdf-format.org/transform/extensions/transform-1.5.0
software: !core/software-1.0.0 {name: asdf-astropy, version: 0.3.0}
software: !core/software-1.0.0 {name: asdf-astropy, version: 0.4.0}
- !core/extension_metadata-1.0.0
extension_class: asdf.extension._manifest.ManifestExtension
extension_uri: asdf://sunpy.org/extensions/sunpy-1.0.0
software: !core/software-1.0.0 {name: sunpy, version: 4.1.1}
software: !core/software-1.0.0 {name: sunpy, version: 5.0.1}
- !core/extension_metadata-1.0.0
extension_class: asdf.extension._manifest.ManifestExtension
extension_uri: asdf://asdf-format.org/astronomy/coordinates/extensions/coordinates-1.0.0
software: !core/software-1.0.0 {name: asdf-astropy, version: 0.3.0}
dataset: !<asdf://dkist.nso.edu/tags/dataset-1.1.0>
software: !core/software-1.0.0 {name: asdf-astropy, version: 0.4.0}
dataset: !<asdf://dkist.nso.edu/tags/dataset-1.2.0>
data: !<asdf://dkist.nso.edu/tags/file_manager-1.0.0>
datatype: float64
fileuris: [efz20040301.000010_s.fits, efz20040301.020010_s.fits, efz20040301.030011_s.fits,
Expand Down Expand Up @@ -388,10 +388,10 @@ dataset: !<asdf://dkist.nso.edu/tags/dataset-1.1.0>
qtable: false
inventory: {}
unit: !unit/unit-1.0.0 count.pixel**-1
wcs: !<tag:stsci.edu:gwcs/wcs-1.0.0>
wcs: !<tag:stsci.edu:gwcs/wcs-1.1.0>
name: ''
steps:
- !<tag:stsci.edu:gwcs/step-1.0.0>
- !<tag:stsci.edu:gwcs/step-1.1.0>
frame: !<tag:stsci.edu:gwcs/frame-1.0.0>
axes_names: [x, y, z]
axes_order: [0, 1, 2]
Expand Down Expand Up @@ -501,7 +501,7 @@ dataset: !<asdf://dkist.nso.edu/tags/dataset-1.1.0>
shape: [11]
inputs: [x0, x1, x]
outputs: [alpha_C, delta_C, y]
- !<tag:stsci.edu:gwcs/step-1.0.0>
- !<tag:stsci.edu:gwcs/step-1.1.0>
frame: !<tag:stsci.edu:gwcs/composite_frame-1.0.0>
frames:
- !<tag:stsci.edu:gwcs/celestial_frame-1.0.0>
Expand Down Expand Up @@ -610,55 +610,55 @@ N
�BLK0 ��hm�B������,�Z�?��?�BLK0J�6�K��y�u.#H��BLK0XXX'\b�-���V�VŻ���n� �@���q�@W9�� �@+���@��Q���@*�� �@�G�z��@V��@w��V�@����@�BLK0XXX��!�Z%��,%����?@@@@@@ @"@$@#ASDF BLOCK INDEX
%YAML 1.1
---
- 18440
- 18505
- 18647
- 18789
- 18931
- 19073
- 19567
- 19973
- 21039
- 21709
- 22071
- 22301
- 22487
- 22893
- 23563
- 23705
- 23979
- 25089
- 25715
- 26473
- 26615
- 26757
- 27163
- 28009
- 28151
- 28293
- 28655
- 29017
- 29159
- 29301
- 29443
- 29585
- 29727
- 29869
- 30011
- 30153
- 30295
- 30437
- 30579
- 30721
- 30863
- 31005
- 31147
- 31289
- 31431
- 31573
- 31715
- 31857
- 31943
- 32013
- 32155
- 18468
- 18533
- 18675
- 18817
- 18959
- 19101
- 19595
- 20001
- 21067
- 21737
- 22099
- 22329
- 22515
- 22921
- 23591
- 23733
- 24007
- 25117
- 25743
- 26501
- 26643
- 26785
- 27191
- 28037
- 28179
- 28321
- 28683
- 29045
- 29187
- 29329
- 29471
- 29613
- 29755
- 29897
- 30039
- 30181
- 30323
- 30465
- 30607
- 30749
- 30891
- 31033
- 31175
- 31317
- 31459
- 31601
- 31743
- 31885
- 31971
- 32041
- 32183
...
Expand Down
Loading