Closed braingram closed 1 week ago
All modified and coverable lines are covered by tests :white_check_mark:
Project coverage is 67.52%. Comparing base (
1e16207
) to head (84143a1
). Report is 3 commits behind head on main.
:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.
🚨 Try these New Features:
I think this looks good! To make sure I understand, these will not be accessed via the meta
tree but rather from the "top level" of the datamodel? I.e. model.x_a1
rather than model.meta.x_a1
?
I think this looks good! To make sure I understand, these will not be accessed via the
meta
tree but rather from the "top level" of the datamodel? I.e.model.x_a1
rather thanmodel.meta.x_a1
?
Exactly! Feel free to give it a try with the current NRM reference file (and this branch) if you're curious.
Thanks! I was able to try it with your branch and it looks good! I realized that there may be two additional keywords whose values are currently hardcoded but that we could read in from this model instead, but I need to confirm if they are actually the same as values we already have in the FITS header, and if so, what we should call the attributes. I should have an answer on that tomorrow. (For more details, this is the message I sent the AMI team):
mask_definitions.py contains:
self.activeD = 6.559 * m # webbpsf kwd DIAM - not a 'circle including all holes' self.OD = 6.610645669291339 * m # Full pupil file size, incl padding, webbpsf kwd PUPLDIAM
while the NRM reference file currently contains:
DIAM = 6.559348 / Flat-to-flat distance across pupil in V3 axis PUPLDIAM= 6.603464 / Full pupil file size, incl padding. PUPL_CRC= 6.603464 / Circumscribing diameter for JWST primary
I'm not sure if
activeD
should be the same asDIAM
(it is, at least up to the fourth decimal place) and ifOD
should be the same asPUPLDIAM
(it isn't quite) but if these are referring to the same quantity we should probably make them consistent.
I'll mark this as draft until we hear back about the extra keywords.
I spoke to my AMI team members and chased down the source of these numbers (or what we should be using) and we'd like to add these two:
diameter:
fits_keyword: DIAM
title: "[m] Flat-to-flat distance across pupil in V3 axis"
pupil_circumscribed:
fits_keyword: PUPL_CRC
title: "[m] Circumscribing diameter for JWST primary"
Thanks for your patience!!
Closes #359
The NRM reference files contain FITS keywords useful to CAL. https://jwst-crds.stsci.edu/browse/jwst_niriss_nrm_0001.fits
This PR adds those keywords to the schema so they are accessible via the datamodel interface:
model.flat_to_flat
model.x_a1
etc...Regression tests running at https://github.com/spacetelescope/RegressionTests/actions/runs/11802888443
Tasks
docs/
pageno-changelog-entry-needed
)changes/
:echo "changed something" > changes/<PR#>.<changetype>.rst
(see below for change types)jwst
regression tests with this branch installed ("git+https://github.com/<fork>/stdatamodels@<branch>"
)news fragment change types...
- ``changes/