Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-held committed Aug 31, 2021
1 parent 693bb69 commit a94fde5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
18 changes: 12 additions & 6 deletions tests/fit/test_fit.py
Expand Up @@ -33,7 +33,7 @@ def test__fit_model_pyhf(mock_minos, example_spec, example_spec_multibin):
fit_results = fit._fit_model_pyhf(model, data)
assert np.allclose(fit_results.bestfit, [1.1, 8.33624084])
assert np.allclose(fit_results.uncertainty, [0.0, 0.38182003])
assert fit_results.labels == ["staterror_Signal-Region", "Signal strength"]
assert fit_results.labels == ["staterror_Signal-Region[0]", "Signal strength"]
assert np.allclose(fit_results.best_twice_nll, 7.82495235)
assert np.allclose(fit_results.corr_mat, [[0.0, 0.0], [0.0, 1.0]])

Expand All @@ -44,7 +44,7 @@ def test__fit_model_pyhf(mock_minos, example_spec, example_spec_multibin):
# signal strength needs to be 1/1.1 to compensate
assert np.allclose(fit_results.bestfit, [1.1, 0.90917877])
assert np.allclose(fit_results.uncertainty, [0.0, 0.12628017])
assert fit_results.labels == ["staterror_Signal-Region", "Signal strength"]
assert fit_results.labels == ["staterror_Signal-Region[0]", "Signal strength"]
assert np.allclose(fit_results.best_twice_nll, 5.61189476)
assert np.allclose(fit_results.corr_mat, [[0.0, 0.0], [0.0, 1.0]])

Expand All @@ -69,7 +69,10 @@ def test__fit_model_pyhf(mock_minos, example_spec, example_spec_multibin):
assert mock_minos.call_count == 1
# first argument to minos call is the Minuit instance
assert mock_minos.call_args[0][1] == ["Signal strength", "abc"]
assert mock_minos.call_args[0][2] == ["staterror_Signal-Region", "Signal strength"]
assert mock_minos.call_args[0][2] == [
"staterror_Signal-Region[0]",
"Signal strength",
]
assert mock_minos.call_args[1] == {}


Expand All @@ -80,7 +83,7 @@ def test__fit_model_custom(mock_minos, example_spec, example_spec_multibin):
fit_results = fit._fit_model_custom(model, data)
assert np.allclose(fit_results.bestfit, [1.1, 8.33625071])
assert np.allclose(fit_results.uncertainty, [0.0, 0.38182151])
assert fit_results.labels == ["staterror_Signal-Region", "Signal strength"]
assert fit_results.labels == ["staterror_Signal-Region[0]", "Signal strength"]
assert np.allclose(fit_results.best_twice_nll, 7.82495235)
assert np.allclose(fit_results.corr_mat, [[0.0, 0.0], [0.0, 1.0]])

Expand All @@ -91,7 +94,7 @@ def test__fit_model_custom(mock_minos, example_spec, example_spec_multibin):
# signal strength needs to be 1/1.1 to compensate
assert np.allclose(fit_results.bestfit, [1.1, 0.90917877])
assert np.allclose(fit_results.uncertainty, [0.0, 0.12628023])
assert fit_results.labels == ["staterror_Signal-Region", "Signal strength"]
assert fit_results.labels == ["staterror_Signal-Region[0]", "Signal strength"]
assert np.allclose(fit_results.best_twice_nll, 5.61189476)
assert np.allclose(fit_results.corr_mat, [[0.0, 0.0], [0.0, 1.0]])

Expand All @@ -116,7 +119,10 @@ def test__fit_model_custom(mock_minos, example_spec, example_spec_multibin):
assert mock_minos.call_count == 1
# first argument to minos call is the Minuit instance
assert mock_minos.call_args[0][1] == ["Signal strength"]
assert mock_minos.call_args[0][2] == ["staterror_Signal-Region", "Signal strength"]
assert mock_minos.call_args[0][2] == [
"staterror_Signal-Region[0]",
"Signal strength",
]
assert mock_minos.call_args[1] == {}


Expand Down
2 changes: 1 addition & 1 deletion tests/visualize/test_visualize.py
Expand Up @@ -394,7 +394,7 @@ def test_correlation_matrix(mock_draw):
def test_pulls(mock_draw):
bestfit = np.asarray([0.8, 1.0, 1.05, 1.1])
uncertainty = np.asarray([0.9, 1.0, 0.03, 0.7])
labels = ["a", "b", "staterror_region[bin_0]", "c"]
labels = ["a", "b", "staterror_region[0]", "c"]
exclude = ["a"]
folder_path = "tmp"
fit_results = fit.FitResults(bestfit, uncertainty, labels, np.empty(0), 1.0)
Expand Down

0 comments on commit a94fde5

Please sign in to comment.