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

deltacchalf filtering: allow image_group mode on single data set #1334

Merged
merged 3 commits into from
Jul 13, 2020

Conversation

rjgildea
Copy link
Contributor

@rjgildea rjgildea commented Jul 13, 2020

It works, and seems to be a valid thing to do, so don't prohibit it. Only catch whole data set deltacchalf mode, which won't work on a single data set (obviously).

Fixes #1161

It works, and seems to be a valid thing to do, so don't prohibit
it. Only catch whole data set deltacchalf mode, which won't work
on a single data set (obviously).
@rjgildea rjgildea added the dials.scale Affects dials.scale label Jul 13, 2020
@codecov
Copy link

codecov bot commented Jul 13, 2020

Codecov Report

Merging #1334 into master will increase coverage by 0.02%.
The diff coverage is 92.85%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1334      +/-   ##
==========================================
+ Coverage   64.19%   64.22%   +0.02%     
==========================================
  Files         617      617              
  Lines       69784    69797      +13     
  Branches     9557     9557              
==========================================
+ Hits        44801    44827      +26     
+ Misses      23215    23207       -8     
+ Partials     1768     1763       -5     
Impacted Files Coverage Δ
algorithms/scaling/algorithm.py 84.10% <0.00%> (+1.98%) ⬆️
algorithms/scaling/test_scale.py 100.00% <100.00%> (ø)
...finement/test_angle_derivatives_wrt_vector_elts.py 96.66% <0.00%> (-3.34%) ⬇️
algorithms/integration/report.py 86.59% <0.00%> (-0.69%) ⬇️
algorithms/scaling/model/model.py 85.22% <0.00%> (+0.17%) ⬆️
algorithms/scaling/plots.py 94.91% <0.00%> (+0.42%) ⬆️
algorithms/scaling/scale_and_filter.py 93.82% <0.00%> (+0.56%) ⬆️
algorithms/statistics/cc_half_algorithm.py 93.09% <0.00%> (+2.63%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8ce3982...35b9407. Read the comment docs.

Copy link
Contributor

@jbeilstenedmands jbeilstenedmands left a comment

Choose a reason for hiding this comment

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

Thanks for sorting this out, looks good.
This wants linking to #1161 when merging in.

@rjgildea rjgildea merged commit f67679d into master Jul 13, 2020
@rjgildea rjgildea deleted the scaling-deltacchalf-image-group branch July 13, 2020 10:48
rjgildea added a commit that referenced this pull request Jul 13, 2020
It works, and seems to be a valid thing to do, so don't prohibit
it. Only catch whole data set deltacchalf mode, which won't work
on a single data set (obviously).

Fixes #1161
rjgildea added a commit that referenced this pull request Jul 15, 2020
It works, and seems to be a valid thing to do, so don't prohibit
it. Only catch whole data set deltacchalf mode, which won't work
on a single data set (obviously).

Fixes #1161
@ndevenish ndevenish mentioned this pull request Jul 20, 2020
ndevenish added a commit that referenced this pull request Jul 20, 2020
- `dials.scale`: Allow usage of `mode=image_group` with `filtering.method=deltacchalf` when only providing a single data set (#1334)
- `dials.import`: When using a template and specifying an image_range, missing images outside of the range will not cause a failure (#1333)
- `dials.stills_process`: Show better error message in specific spotfinding failure case (#1180)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dials.scale Affects dials.scale
Projects
None yet
Development

Successfully merging this pull request may close these issues.

why scale filtering feature is supported only in multi-dataset scaling mode?
2 participants