From 99ccd93d1baeaedd29d21904dc9a5175292652e3 Mon Sep 17 00:00:00 2001 From: James Beilsten-Edmands <30625594+jbeilstenedmands@users.noreply.github.com> Date: Fri, 22 Sep 2023 16:42:32 +0100 Subject: [PATCH] Update expected output after binning change --- tests/command_line/test_estimate_resolution.py | 4 ++-- tests/util/test_resolution_analysis.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/command_line/test_estimate_resolution.py b/tests/command_line/test_estimate_resolution.py index f14180559b..3128a98121 100644 --- a/tests/command_line/test_estimate_resolution.py +++ b/tests/command_line/test_estimate_resolution.py @@ -41,12 +41,12 @@ def test_x4wide(input_files, dials_data, run_in_tmp_path, capsys): ) captured = capsys.readouterr() expected_output = ( - "Resolution rmerge: 1.34", + "Resolution rmerge: 1.33", "Resolution cc_half: 1.56", "Resolution cc_ref: 1.3", "Resolution I/sig: 1.53", "Resolution Mn(I/sig): 1.51", - "Resolution Mn(I)/Mn(sig): 1.50", + "Resolution Mn(I)/Mn(sig): 1.49", ) for line in expected_output: assert line in captured.out diff --git a/tests/util/test_resolution_analysis.py b/tests/util/test_resolution_analysis.py index bb4a25c283..534ebb6480 100644 --- a/tests/util/test_resolution_analysis.py +++ b/tests/util/test_resolution_analysis.py @@ -69,10 +69,9 @@ def merging_stats(dials_data): def test_resolution_fit(merging_stats): d_star_sq = flex.double(uctbx.d_as_d_star_sq(b.d_min) for b in merging_stats.bins) - n_obs = None y_obs = flex.double(b.r_merge for b in merging_stats.bins) result = resolution_analysis.resolution_fit( - d_star_sq, y_obs, resolution_analysis.log_inv_fit, 0.6, n_obs + d_star_sq, y_obs, resolution_analysis.log_inv_fit, 0.6, n_obs=None ) assert result.d_min == pytest.approx(1.278, abs=1e-3) assert flex.max(flex.abs(result.y_obs - result.y_fit)) < 0.05