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

Swap slow fast to fast slow when setting beam centre #421

Merged
merged 6 commits into from
Oct 29, 2021
Merged

Conversation

dagewa
Copy link
Member

@dagewa dagewa commented Aug 16, 2021

It is a source of occasional annoyance that setting the beam centre by pixel coordinates in DIALS requires passing it in the order slow, fast [panel], whereas the user may expect fast, slow, [panel] as a more natural ordering. Indeed, in a new tutorial it was noted that dials.generate_mask untrusted.circle=1059,988,100 accepts values in the order fast, slow, radius.

This PR introduces fast_slow_beam_centre as a new way to set the beam centre. The previous parameter, slow_fast_beam_centre continues to exist, but will be overridden by the fast, slow version if both are set.

A parallel PR in the DIALS repository will change the display in the image viewer to the fast, slow order.

@codecov
Copy link

codecov bot commented Aug 16, 2021

Codecov Report

Merging #421 (1d8ccf1) into main (23c3a9b) will increase coverage by 2.17%.
The diff coverage is 90.37%.

❗ Current head 1d8ccf1 differs from pull request most recent head 3014968. Consider uploading reports for the commit 3014968 to get more accurate results

@@            Coverage Diff             @@
##             main     #421      +/-   ##
==========================================
+ Coverage   64.46%   66.64%   +2.17%     
==========================================
  Files         177      183       +6     
  Lines       15309    16580    +1271     
  Branches     2077     2181     +104     
==========================================
+ Hits         9869    11049    +1180     
- Misses       4896     4973      +77     
- Partials      544      558      +14     

@ndevenish
Copy link
Collaborator

but will be overridden by the fast, slow version if both are set

Can we make this an error instead if both are specified (or specified differently)

@dagewa dagewa requested a review from ndevenish September 14, 2021 12:31
@dagewa
Copy link
Member Author

dagewa commented Sep 14, 2021

Thanks for the suggestions, I think I have dealt with those now. dials/dials#1849 is intended to be merged at the same time.

@ndevenish ndevenish merged commit 605c397 into main Oct 29, 2021
@ndevenish ndevenish deleted the swap_slow_fast branch October 29, 2021 10:28
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.

3 participants