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

feat: Add kwarg for AsymptoticCalculator base distribution #993

Merged
merged 18 commits into from
Feb 14, 2021

Conversation

lukasheinrich
Copy link
Contributor

@lukasheinrich lukasheinrich commented Jul 27, 2020

Description

Resolves #1159

In the standard brazil band plot ROOT HypotestInverter produces, there is a bit of an imprecision as the expected limits are calculated in $\hat{\mu}/\sigma$ space but for significant upward fluctuations it returns p-values that are not actually realizable with any data since if expected $\hat{\mu} > \mu$ the test stat can at most be the one returned for $\mu=\hat{\mu}$, namely $q_\mu = 0$, that in turn means that the p-value is capped at $\mathrm{CLs}_\mathrm{obs}$.

For compatibility and recognizability the default behavior is unchanged but it's now possible to get the correct asymptotic bahaviorr with calc_kwargs = {'base_dir': 'clipped_normal'}

image

ReadTheDocs build: https://pyhf.readthedocs.io/en/clipped_expected/api.html#inference

Checklist Before Requesting Reviewer

  • Tests are passing
  • "WIP" removed from the title of the pull request
  • Selected an Assignee for the PR to be responsible for the log summary

Before Merging

For the PR Assignees:

  • Summarize commit messages into a comprehensive review of the PR
* Add calc_base_dist kwarg to AsymptoticCalculator to control cutoff for AsymptoticTestStatDistribution
* Add test for calc_base_dist behavior for 'clipped_normal'
* Add docstring example for pvalue
* Update docstring for AsymptoticCalculator and ToyCalculator

Co-authored-by: Matthew Feickert <matthew.feickert@cern.ch>

Copy link
Contributor

@kratsg kratsg left a comment

Choose a reason for hiding this comment

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

The changes look fine. Additional docstrings are needed to describe the new APIs. Otherwise, most of my concern is on the description:

In the standard brazil band plot ROOT HypotestInverter produces, there is a bit of an imprecision as the expected limits are calculated in $mu^/sigma$ space but for significant upward fluctuations it returns p-values that are not actually realizable with any data since if $expected µ^ &gt; µ$ the test stat can at most be the one returned for $µ=0$ that in turn means that the p-value is capped at $$

I don't follow this logic. Let's suppose, for example, scanning $µ$ from [0, 10], then if $µ^ &gt; 10$ (a significant upward fluctuation?), wouldn't the test stat likely be the one returned for $µ=10$? If so, I understand that you want to apply a cap.. but what I don't understand is how, if we have bounds on $µ$, that we're able to get unrealizable p-values.

src/pyhf/infer/calculators.py Outdated Show resolved Hide resolved
src/pyhf/infer/calculators.py Outdated Show resolved Hide resolved
@lukasheinrich lukasheinrich changed the title calculator kwargs feat: calculator kwargs Jul 29, 2020
@codecov
Copy link

codecov bot commented Jul 29, 2020

Codecov Report

Merging #993 (2d4e6fd) into master (00af4ba) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #993   +/-   ##
=======================================
  Coverage   97.49%   97.49%           
=======================================
  Files          63       63           
  Lines        3749     3758    +9     
  Branches      535      537    +2     
=======================================
+ Hits         3655     3664    +9     
  Misses         55       55           
  Partials       39       39           
Flag Coverage Δ
unittests 97.49% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
src/pyhf/infer/calculators.py 100.00% <100.00%> (ø)

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 00af4ba...2d4e6fd. Read the comment docs.

@matthewfeickert
Copy link
Member

@lukasheinrich I rebased this but have a pre-rebase version at backup-clipped_expected in case I borked anything too badly. 😬.

We should discuss all of this again, but as we've introduced kwargs since this PR started I changed calc_kwargs to just be a calc_base_dist kwarg. With this rebase I'm able to have the following code snippet produce the following plots which you made earlier.

import pyhf
import pyhf.contrib.viz.brazil as barzil_band
import numpy as np
import matplotlib.pyplot as plt

model = pyhf.simplemodels.hepdata_like(
    signal_data=[20.0], bkg_data=[50.0], bkg_uncerts=[7.0]
)
data = [70.0] + model.config.auxdata

poi_vals = np.linspace(0, 2.5)
results = [
    pyhf.infer.hypotest(
        test_poi, data, model, return_expected_set=True, calc_base_dist="normal"
    )
    for test_poi in poi_vals
]

fig, ax = plt.subplots()
barzil_band.plot_results(ax, poi_vals, results)
fig.savefig("base_dist_normal.png")

results = [
    pyhf.infer.hypotest(
        test_poi, data, model, return_expected_set=True, calc_base_dist="clipped_normal"
    )
    for test_poi in poi_vals
]

fig, ax = plt.subplots()
barzil_band.plot_results(ax, poi_vals, results)
fig.savefig("base_dist_clipped_normal.png")
base_dist_normal.png base_dist_clipped_normal.png
base_dist_normal base_dist_clipped_normal

The tests pass also beyond having to fixup doctest, so I think this is moving in the right direction.

@matthewfeickert
Copy link
Member

This PR also addresses some of Issue #1268, which while not the goal is nice. 👍

@matthewfeickert matthewfeickert changed the title feat: calculator kwargs feat: Add kwarg for AsymptoticCalculator base distribution Feb 9, 2021
@matthewfeickert matthewfeickert added docs Documentation related tests pytest labels Feb 9, 2021
@matthewfeickert
Copy link
Member

matthewfeickert commented Feb 9, 2021

The changes look fine. Additional docstrings are needed to describe the new APIs.

In addition to the APIs being updated the docstring for AsymptoticCalculator

test_stat="qtilde",
):
r"""
Asymptotic Calculator.
Args:
data (:obj:`tensor`): The observed data.
pdf (~pyhf.pdf.Model): The statistical model adhering to the schema ``model.json``.
init_pars (:obj:`tensor`): The initial parameter values to be used for fitting.
par_bounds (:obj:`tensor`): The parameter value bounds to be used for fitting.
fixed_params (:obj:`tensor`): Whether to fix the parameter to the init_pars value during minimization
test_stat (:obj:`str`): The test statistic to use as a numerical summary of the data.
qtilde (:obj:`bool`): When ``True`` perform the calculation using the alternative
test statistic, :math:`\tilde{q}_{\mu}`, as defined under the Wald
approximation in Equation (62) of :xref:`arXiv:1007.1727`
(:func:`~pyhf.infer.test_statistics.qmu_tilde`).
When ``False`` use :func:`~pyhf.infer.test_statistics.qmu`.

should also get fixed up, as qtilde is no longer an arg

@matthewfeickert
Copy link
Member

@kratsg @lukasheinrich This PR still needs to address the docstring requests that @kratsg and I made, but beyond that I think is ready for review. If you both make comments I will implement anything else that needs to get taken care of. 👍

@matthewfeickert matthewfeickert self-assigned this Feb 9, 2021
@matthewfeickert
Copy link
Member

Also maybe worth discussing if the changes to the EmpiricalDistribution from PR #1160 should be migrated to this PR as well.

@lukasheinrich
Copy link
Contributor Author

can't aprrovemy own PR but thanks for rebasing. lgtm.

v0.6.0 automation moved this from In progress to Reviewer approved Feb 14, 2021
Copy link
Contributor

@kratsg kratsg left a comment

Choose a reason for hiding this comment

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

Will continue discussion in #1310 to not hold up this PR any longer.

@kratsg kratsg merged commit ae9e39c into master Feb 14, 2021
v0.6.0 automation moved this from Reviewer approved to Done Feb 14, 2021
@kratsg kratsg deleted the clipped_expected branch February 14, 2021 23:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Documentation related feat/enhancement New feature or request tests pytest
Projects
No open projects
v0.6.0
  
Done
Development

Successfully merging this pull request may close these issues.

support variations on CLs dealing w/ inclusive pvalue and clipping
3 participants