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

JP-3668: Move tweakreg into stcal #8624

Merged
merged 24 commits into from
Jul 25, 2024
Merged

Conversation

emolter
Copy link
Collaborator

@emolter emolter commented Jul 3, 2024

Resolves JP-3668

Closes #8594

The portions of the tweakreg step that are shared between jwst and romancal are being moved into the stcal repository; see this stcal PR. This PR updates the jwst pipeline accordingly.

Checklist for PR authors (skip items if you don't have permissions or they are not applicable)

  • 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
  • All comments are resolved
  • Make sure the JIRA ticket is resolved properly

Copy link

codecov bot commented Jul 3, 2024

Codecov Report

Attention: Patch coverage is 79.62963% with 11 lines in your changes missing coverage. Please review.

Project coverage is 60.05%. Comparing base (d9a59d2) to head (94ce74e).

Files with missing lines Patch % Lines
jwst/resample/resample_utils.py 33.33% 6 Missing ⚠️
jwst/tweakreg/tweakreg_step.py 84.84% 5 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8624      +/-   ##
==========================================
- Coverage   60.21%   60.05%   -0.17%     
==========================================
  Files         370      369       -1     
  Lines       38635    38409     -226     
==========================================
- Hits        23265    23065     -200     
+ Misses      15370    15344      -26     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@emolter
Copy link
Collaborator Author

emolter commented Jul 10, 2024

regression tests started here. Still can't figure out why the singular unit test is failing, but if regtests turn up more failures that might give more information.

@emolter
Copy link
Collaborator Author

emolter commented Jul 11, 2024

one-liner change to make the version of update_s_region_imaging in stcal identical to what used to be in the jwst repo did indeed fix the regtest failures. Unfortunately, these seem unrelated to the single unit test failure tweakreg/tests/test_multichip_jwst.py:test_multichip_alignment_step. Still tracking that one down.

@emolter emolter requested review from braingram and mcara July 11, 2024 15:18
@emolter emolter added this to the Build 11.1 milestone Jul 11, 2024
@emolter
Copy link
Collaborator Author

emolter commented Jul 11, 2024

@mcara RE the one unit test that is failing: I still don't quite understand what it is trying to do, exactly, but I put the results of some initial exploration of what could be going wrong into a docstring on the test itself. I'm not asking you to diagnose this in detail for me, necessarily, but based on those notes perhaps you can suggest where things might be going wrong or what else I should check.

Copy link
Member

@mcara mcara left a comment

Choose a reason for hiding this comment

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

Failing tests are due to monkeypatch not patching align_wcs.

@emolter emolter marked this pull request as ready for review July 12, 2024 13:12
@emolter emolter requested a review from a team as a code owner July 12, 2024 13:12
Copy link
Member

@mcara mcara left a comment

Choose a reason for hiding this comment

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

I will withhold my final review pending review of the sister PR in stcal. Both PRs look good but I would like to look into the issue of data model interface. At this time this PR is "Approved" but I do not want it merged yet.

Copy link
Member

@mcara mcara left a comment

Choose a reason for hiding this comment

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

LGTM

@emolter
Copy link
Collaborator Author

emolter commented Jul 18, 2024

started new regression test run here

@emolter
Copy link
Collaborator Author

emolter commented Jul 22, 2024

new regression tests started here, after minor changes to both stcal and jwst sides.

edit: lots of failing regression tests due to very small differences in the S_REGION. looking into the reason

@emolter
Copy link
Collaborator Author

emolter commented Jul 23, 2024

Another new set of regtests here

@emolter
Copy link
Collaborator Author

emolter commented Jul 24, 2024

regression test run covering fix of the final few failing S_REGION issues - all passing

Copy link
Collaborator

@melanieclarke melanieclarke left a comment

Choose a reason for hiding this comment

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

I'll defer to all the expert reviews already done for this change. From a cursory review, this looks ready to go to me.

It looks like pyproject.toml needs an update after the stcal change is merged, so I'll hold off on approval, pending that coordination.

Copy link
Collaborator

@nden nden left a comment

Choose a reason for hiding this comment

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

LGTM

@emolter
Copy link
Collaborator Author

emolter commented Jul 25, 2024

I'll defer to all the expert reviews already done for this change. From a cursory review, this looks ready to go to me.

It looks like pyproject.toml needs an update after the stcal change is merged, so I'll hold off on approval, pending that coordination.

I just merged the stcal side since Nadia gave the approval. The correct thing to pin is stcal@main, right? And wait for an stcal release to change it to 1.8.0 later? @melanieclarke

@melanieclarke
Copy link
Collaborator

I just merged the stcal side since Nadia gave the approval. The correct thing to pin is stcal@main, right? And wait for an stcal release to change it to 1.8.0 later? @melanieclarke

Sounds right to me. @braingram?

Co-authored-by: Brett Graham <[email protected]>
Copy link
Collaborator

@melanieclarke melanieclarke left a comment

Choose a reason for hiding this comment

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

Okay, all looks good now!

@emolter emolter merged commit 859ac8e into spacetelescope:master Jul 25, 2024
24 checks passed
@emolter emolter deleted the JP-3668 branch July 25, 2024 20:02
@stscijgbot-jp stscijgbot-jp mentioned this pull request Jul 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

tweakreg to stcal
5 participants