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 incorrect output files in dials.scale targeted scaling if >1 target sweep #1815

Merged
merged 2 commits into from
Jul 21, 2021

Conversation

jbeilstenedmands
Copy link
Contributor

Fix corner case where incorrect datasets were saved as output for targeted scaling.

@jbeilstenedmands jbeilstenedmands enabled auto-merge (squash) July 21, 2021 10:33
@codecov
Copy link

codecov bot commented Jul 21, 2021

Codecov Report

Merging #1815 (9fcc3c6) into main (9983e78) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main    #1815   +/-   ##
=======================================
  Coverage   67.13%   67.13%           
=======================================
  Files         617      617           
  Lines       69406    69412    +6     
  Branches     9654     9654           
=======================================
+ Hits        46594    46600    +6     
  Misses      20870    20870           
  Partials     1942     1942           

@jbeilstenedmands jbeilstenedmands merged commit ed3fbd3 into main Jul 21, 2021
@jbeilstenedmands jbeilstenedmands deleted the scaling_target_bugfix branch July 21, 2021 11:58
DiamondLightSource-build-server added a commit that referenced this pull request Jul 26, 2021
Bugfixes
--------

- ``dials.stills_process``: Fix case where imagesets and experiment filenames could potentially disagree (#1814)
- ``dials.scale``: Fix incorrect output files, for targeted scaling with more than one target dataset. (#1815)
- ``dials.image_viewer``: Fix opening datasets with ``load_models=False`` (#1818)
DiamondLightSource-build-server added a commit that referenced this pull request Jul 27, 2021
Bugfixes
--------

- ``dials.stills_process``: Fix case where imagesets and experiment filenames could potentially disagree (#1814)
- ``dials.scale``: Fix incorrect output files, for targeted scaling with more than one target dataset. (#1815)
- ``dials.image_viewer``: Fix opening datasets with ``load_models=False`` (#1818)
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