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.

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

Use factor_ev_angstrom from cctbx #209

Merged
merged 3 commits into from
Aug 20, 2020
Merged

Use factor_ev_angstrom from cctbx #209

merged 3 commits into from
Aug 20, 2020

Conversation

phyy-nx
Copy link
Contributor

@phyy-nx phyy-nx commented Aug 11, 2020

Fixes #204

@phyy-nx
Copy link
Contributor Author

phyy-nx commented Aug 11, 2020

(note @Anthchirp the constants aren't accessible through python via scitbx, only through cctbx's __init__ file)

@phyy-nx phyy-nx force-pushed the factor_ev_angstrom branch from 56b4b15 to de246f3 Compare August 12, 2020 00:00
Anthchirp
Anthchirp approved these changes Aug 18, 2020
View reviewed changes
Copy link
Member

@Anthchirp Anthchirp left a comment

Choose a reason for hiding this comment

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

minor import fixes needed, looks good to me otherwise.

format/FormatCBFMini.py Outdated Show resolved Hide resolved
format/FormatHDF5Sacla.py Outdated Show resolved Hide resolved
format/FormatHDF5SaclaMPCCD.py Outdated Show resolved Hide resolved
format/FormatHDF5SaclaRayonix.py Outdated Show resolved Hide resolved
format/nexus.py Outdated Show resolved Hide resolved
format/nexus.py Outdated Show resolved Hide resolved
tests/model/test_spectrum.py Show resolved Hide resolved
@Anthchirp
Copy link
Member

@ndevenish will probably suggest adding a newsfragment 🙂

phyy-nx and others added 3 commits August 20, 2020 12:03
@phyy-nx
Use factor_ev_angstrom from cctbx
a31ab33 
Fixes #204
@phyy-nx @Anthchirp
Apply suggestions from code review
b41161d 
Co-authored-by: Markus Gerstel <2102431+Anthchirp@users.noreply.github.com>
@phyy-nx
More code review and news fragment
3f7cffd
@phyy-nx phyy-nx force-pushed the factor_ev_angstrom branch from 551fa15 to 3f7cffd Compare August 20, 2020 19:26
@phyy-nx phyy-nx merged commit 9e157b7 into master Aug 20, 2020
@phyy-nx phyy-nx deleted the factor_ev_angstrom branch August 20, 2020 19:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Anthchirp Anthchirp Anthchirp approved these changes

@biochem-fan biochem-fan Awaiting requested review from biochem-fan

@graeme-winter graeme-winter Awaiting requested review from graeme-winter

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove hardcoded eV conversion factors
2 participants
@phyy-nx @Anthchirp