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 crash in dials.scale when no reflections remain after initial filtering #1654

Merged
merged 3 commits into from
Apr 15, 2021

Conversation

jbeilstenedmands
Copy link
Contributor

This can be caused in edge cases where there are no good reflections left, and was due to an uncaught BadDatasetForScalingException. This is now correctly caught and the dataset excluded as originally intended.

Requires #1653 to be merged first as the new test in this PR also triggers that separate bug.

@codecov
Copy link

codecov bot commented Apr 15, 2021

Codecov Report

Merging #1654 (048320f) into main (c8fc3d9) will increase coverage by 0.02%.
The diff coverage is 82.85%.

❗ Current head 048320f differs from pull request most recent head 3ed485e. Consider uploading reports for the commit 3ed485e to get more accurate results

@@            Coverage Diff             @@
##             main    #1654      +/-   ##
==========================================
+ Coverage   66.66%   66.69%   +0.02%     
==========================================
  Files         616      616              
  Lines       69013    69040      +27     
  Branches     9603     9606       +3     
==========================================
+ Hits        46008    46044      +36     
+ Misses      21069    21061       -8     
+ Partials     1936     1935       -1     

@jbeilstenedmands jbeilstenedmands merged commit 66f24ad into main Apr 15, 2021
@jbeilstenedmands jbeilstenedmands deleted the scaling_error_handling_bug branch April 15, 2021 08:38
ndevenish pushed a commit that referenced this pull request Apr 15, 2021
…tering (#1654)

This was due to an uncaught 'BadDatasetForScalingException'
DiamondLightSource-build-server added a commit that referenced this pull request Apr 15, 2021
Bugfixes
--------

- ``dials.scale``: Fix crash when full-matrix minimisation is unsuccessful due to indeterminate normal equations. (#1653)
- ``dials.scale``: Fix crash when no reflections remain after initial filtering. (#1654)
DiamondLightSource-build-server added a commit that referenced this pull request Apr 15, 2021
Bugfixes
--------

- ``dials.scale``: Fix crash when full-matrix minimisation is unsuccessful due to indeterminate normal equations. (#1653)
- ``dials.scale``: Fix crash when no reflections remain after initial filtering. (#1654)
- ``dials.export``: Fix error observed with ``format=mmcif`` for narrow sweeps with low symmetry (#1656)
DiamondLightSource-build-server added a commit that referenced this pull request Apr 16, 2021
Bugfixes
--------

- ``dials.scale``: Fix crash when full-matrix minimisation is unsuccessful due to indeterminate normal equations. (#1653)
- ``dials.scale``: Fix crash when no reflections remain after initial filtering. (#1654)
- ``dials.export``: Fix error observed with ``format=mmcif`` for narrow sweeps with low symmetry (#1656)
DiamondLightSource-build-server added a commit that referenced this pull request Apr 17, 2021
Bugfixes
--------

- ``dials.scale``: Fix crash when full-matrix minimisation is unsuccessful due to indeterminate normal equations. (#1653)
- ``dials.scale``: Fix crash when no reflections remain after initial filtering. (#1654)
- ``dials.export``: Fix error observed with ``format=mmcif`` for narrow sweeps with low symmetry (#1656)
DiamondLightSource-build-server added a commit that referenced this pull request Apr 18, 2021
Bugfixes
--------

- ``dials.scale``: Fix crash when full-matrix minimisation is unsuccessful due to indeterminate normal equations. (#1653)
- ``dials.scale``: Fix crash when no reflections remain after initial filtering. (#1654)
- ``dials.export``: Fix error observed with ``format=mmcif`` for narrow sweeps with low symmetry (#1656)
DiamondLightSource-build-server added a commit that referenced this pull request Apr 19, 2021
Bugfixes
--------

- ``dials.scale``: Fix crash when full-matrix minimisation is unsuccessful due to indeterminate normal equations. (#1653)
- ``dials.scale``: Fix crash when no reflections remain after initial filtering. (#1654)
- ``dials.export``: Fix error observed with ``format=mmcif`` for narrow sweeps with low symmetry (#1656)
DiamondLightSource-build-server added a commit that referenced this pull request Apr 19, 2021
Bugfixes
--------

- ``dials.scale``: Fix crash when full-matrix minimisation is unsuccessful due to indeterminate normal equations. (#1653)
- ``dials.scale``: Fix crash when no reflections remain after initial filtering. (#1654)
- ``dials.export``: Fix error observed with ``format=mmcif`` for narrow sweeps with low symmetry (#1656)
- Fix image numbering inconsistency in ascii histogram of per-image spot counts (#1660)
DiamondLightSource-build-server added a commit that referenced this pull request Apr 19, 2021
Bugfixes
--------

- ``dials.scale``: Fix crash when full-matrix minimisation is unsuccessful due to indeterminate normal equations. (#1653)
- ``dials.scale``: Fix crash when no reflections remain after initial filtering. (#1654)
- ``dials.export``: Fix error observed with ``format=mmcif`` for narrow sweeps with low symmetry (#1656)
- Fix image numbering inconsistency in ascii histogram of per-image spot counts (#1660)
- ``dials.find_spots_server``: Significant performance improvement for HDF5 grid scans. (#1665)
DiamondLightSource-build-server added a commit that referenced this pull request Apr 20, 2021
Bugfixes
--------

- ``dials.scale``: Fix crash when full-matrix minimisation is unsuccessful due to indeterminate normal equations. (#1653)
- ``dials.scale``: Fix crash when no reflections remain after initial filtering. (#1654)
- ``dials.export``: Fix error observed with ``format=mmcif`` for narrow sweeps with low symmetry (#1656)
- Fix image numbering inconsistency in ascii histogram of per-image spot counts (#1660)
- ``dials.find_spots_server``: Significant performance improvement for HDF5 grid scans. (#1665)
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

2 participants