Skip to content

Put the MorphRGrid at the end of the morphing chain #232

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

Merged
merged 8 commits into from
Jul 9, 2025

Conversation

Sparks29032
Copy link
Collaborator

@Sparks29032 Sparks29032 commented Jul 9, 2025

See news (config_order.rst) comment for why this is done. Preparation for morphfuncx and morphfuncxy.

@Sparks29032
Copy link
Collaborator Author

Sparks29032 commented Jul 9, 2025

Note that only the morphapp.py file is changed. All other changes are as this is built off PR #231. The tests will fail if the changes in #231 are not included as small numerical differences occur. All numerical differences are less than the refiner tolerance of 1e-08.

The files changed should go away once #231 is merged.

Copy link

codecov bot commented Jul 9, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 99.08%. Comparing base (5d9fd64) to head (55e3ab1).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #232   +/-   ##
=======================================
  Coverage   99.08%   99.08%           
=======================================
  Files          21       21           
  Lines        1087     1087           
=======================================
  Hits         1077     1077           
  Misses         10       10           
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Contributor

@sbillinge sbillinge 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 merge this so you can move ahead, but please see comment and make an issue. Also, in common with things like np.all_cloae etc, could we drop the "are" from the name and make it more like files_all_close or something like that. We could also borrow the signature and pass through tolerances. Again, this can be done later, after beam time... Just make an issue now so we don't forget

@@ -50,6 +50,20 @@ def isfloat(s):
return False


def are_files_same(file1, file2):
"""Assert that two files have (approximately) the same numerical
Copy link
Contributor

Choose a reason for hiding this comment

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

This looks as if it is a copy paste of the one in the other PR. Can we put it into conftest. Py and make it available to all tests as a fixture?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It is from the other PR. After merging with main, this change is no longer present.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is only needed in the io tests as that is the only test creating files. As such, no need to put into contest.

Copy link
Contributor

Choose a reason for hiding this comment

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

ah, ok

@sbillinge sbillinge merged commit f8ee98a into diffpy:main Jul 9, 2025
5 checks passed
@Sparks29032
Copy link
Collaborator Author

Created #233 just in case we want to revisit names.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants