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

Fix broken exclude_images= option in dials.scale #1509

Merged
merged 2 commits into from
Dec 2, 2020

Conversation

jbeilstenedmands
Copy link
Contributor

Processing user data in the ccp4 workshop today revealed that this is currently broken, likely due to some recent changes to scaling flags, which effective resets the flags right after setting them for exclude_images....

So this change resets the flags as the very first thing. Tests also updated to explicitly check the number of scaled reflections coming out after excluding which would have caught this.

Likely to be broken since some scaling flag changes. Improve test to catch and fix.
Currently just doesn't do anything.
@codecov
Copy link

codecov bot commented Dec 2, 2020

Codecov Report

Merging #1509 (fd24c51) into master (84a2657) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #1509      +/-   ##
==========================================
+ Coverage   65.56%   65.57%   +0.01%     
==========================================
  Files         614      614              
  Lines       68939    68957      +18     
  Branches     9530     9530              
==========================================
+ Hits        45198    45218      +20     
+ Misses      21902    21900       -2     
  Partials     1839     1839              

@jbeilstenedmands jbeilstenedmands merged commit 9632039 into master Dec 2, 2020
@jbeilstenedmands jbeilstenedmands deleted the fix_scaling_exclude_images branch December 2, 2020 22:42
jbeilstenedmands added a commit that referenced this pull request Dec 2, 2020
Likely broken in 3.2 series since some scaling flag changes (#2478b1e146ee2bbc14f57c29ea701ecae36c17a8), currently just doesn't do anything.
Improve test to catch and fix.
@ndevenish ndevenish mentioned this pull request Dec 7, 2020
ndevenish added a commit that referenced this pull request Dec 7, 2020
Bugfixes
--------

- ``dials.slice_sequence``: Fix crash using ``block_size=`` option (#1502)
- ``dials.scale``: Fix broken ``exclude_images=`` option (#1509)
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.

None yet

1 participant