8000 JP-2803: Propagate asn keywords to resample output products for level 2 processing by tapastro · Pull Request #6989 · spacetelescope/jwst · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

JP-2803: Propagate asn keywords to resample output products for level 2 processing #6989

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Aug 17, 2022
Merged

JP-2803: Propagate asn keywords to resample output products for level 2 processing #6989

merged 4 commits into from
Aug 17, 2022

Conversation

tapastro
Copy link
Contributor
@tapastro tapastro commented Aug 16, 2022 •
edited
Loading

Resolves JP-2803

Closes #

This PR adds assignment of model.meta.asn.pool_name and {...}.table_name to level 2b i2d products - this required propagating these keywords through an intermediate ModelContainer in the resample step.

There was discussion in the JIRA ticket of propagating values from the first contained model if any ModelContainer was found have no assigned values, but I felt that this covers the issue more cleanly - if there is a need for other behavior, please let me know.

NB: If a user runs e.g. strun calwebb_image2 some_rate.fits, the i2d output will have values of 'singleton' for both of these keywords. If using a MAST-provided level2 asn, the values propagate as expected.

Checklist for maintainers

  • added entry in CHANGES.rst within the relevant release section
  • updated or added relevant tests
  • updated relevant documentation
  • added relevant milestone
  • added relevant label(s)
  • ran regression tests, post a link to the Jenkins job below.
    How to run regression tests on a PR
  • Make sure the JIRA ticket is resolved properly

@tapastro tapastro added this to the Build 9.0 milestone Aug 16, 2022
@codecov
Copy link
codecov bot commented Aug 16, 2022 •
edited
Loading

Codecov Report

Merging #6989 (85999c6) into master (4c3eca7) will increase coverage by 0.12%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #6989      +/-   ##
==========================================
+ Coverage   79.27%   79.39%   +0.12%     
==========================================
  Files         414      414              
  Lines       37478    37481       +3     
==========================================
+ Hits        29709    29758      +49     
+ Misses       7769     7723      -46
Flag Coverage Δ
nightly 79.36% <100.00%> (+0.12%) ⬆️
unit 53.11% <100.00%> (+<0.01%) ⬆️
Impacted Files Coverage Δ
jwst/resample/resample_spec_step.py 97.26% <100.00%> (+0.03%) ⬆️
jwst/resample/resample_step.py 88.32% <100.00%> (+0.17%) ⬆️
jwst/regtest/regtestdata.py 86.23% <0.00%> (+1.37%) ⬆️
jwst/regtest/conftest.py 88.04% <0.00%> (+23.36%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

hbushouse
hbushouse approved these changes Aug 16, 2022
View reviewed changes
Copy link
Collaborator
@hbushouse hbushouse left a comment

Choose a reason for hiding this comment

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

Looks good to me.

Could resample_spec have the same issue for the s2d products created from a single input cal file?

@hbushouse
Copy link
Collaborator

Don't forget to run regtests against the PR branch!

@tapastro
Copy link
Contributor Author

I have a Jenkins-RT run going, but I'll restart now that I've added a line to resample_spec - it looks like the table_name was being added in the style of taking the first contained model keyword values and assigning to the ModelContainer, so I've added a line for the pool_name as well.

@tapastro
Copy link
Contributor Author
tapastro commented Aug 16, 2022 •
edited
Loading

Jenkins #386 showed three failures where values for ASNPOOL and ASNTABLE are now present for three level 2b i2d files - running #387 now that resample_spec outputs will change for level 2 products. Will update this PR in the morning with results.

@tapastro tapastro changed the title JP-2803: Assign asn keywords to step-constructed ModelContainer for singleton inputs JP-2803: Assign asn keywords to step-constructed ModelContainer for level 2 processing Aug 16, 2022
@tapastro tapastro changed the title JP-2803: Assign asn keywords to step-constructed ModelContainer for level 2 processing JP-2803: Propagate asn keywords to resample output products for level 2 processing Aug 16, 2022
@tapastro
Copy link
Contributor Author
tapastro commented Aug 17, 2022 •
edited
Loading

Jenkins run 387 shows 31 failures, all of which are keyword additions due to the new code.

@hbushouse
Copy link
Collaborator

So this is ready to merge, but I'm going to wait a bit until a regtest run for another recent merge is finished and we have a chance to update truth files for that one (so that the differences don't get mingled together).

@hbushouse hbushouse merged commit 097ec29 into spacetelescope:master Aug 17, 2022
@hbushouse hbushouse added the 8.1 patch PR candidate for an 8.1 patch release label Aug 30, 2022
zacharyburnett pushed a commit to zacharyburnett/jwst that referenced this pull request Aug 31, 2022
@tapastro @zacharyburnett
JP-2803: Propagate asn keywords to resample output products for level…
7a3968d 
… 2 processing (spacetelescope#6989)

* push singleton input asn keywords to ModelContainer

* changelog

* changelog number

* update pool name for resample_spec

(cherry picked from commit 097ec29)
@hbushouse hbushouse modified the milestones: Build 9.0, Build 8.1.2 Sep 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stscieisenhamer stscieisenhamer stscieisenhamer approved these changes

@hbushouse hbushouse hbushouse approved these changes

Assignees
No one assigned
Labels
8.1 patch PR candidate for an 8.1 patch release resample
Projects
None yet
Milestone
Build 8.1.2
Development

Successfully merging this pull request may close these issues.
3 participants
@tapastro @hbushouse @stscieisenhamer
0