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

Removes all hash for parameters not used for each source, and for all… #37

Merged
merged 10 commits into from
Jul 17, 2023

Conversation

kdund
Copy link
Member

@kdund kdund commented Jul 13, 2023

  • Adds the option to add efficiency parameters.
  • adds all shape parameters not used and all efficiency parameters to each sources extra_dont_hash_settings, thereby avoiding caching PDFs for parameter changes that do not affect the PDF.

This code produces only 4 cached PDFs (2 WIMP 2 ER):


from alea.blueice_extended_model import BlueiceExtendedModel
statistical_model = BlueiceExtendedModel.from_config(config_path)


data = statistical_model.generate_data(wimp_rate_multiplier = 10.)
data[2]["signal_efficiency"] = 0.2
statistical_model.data = data
print("set signal eff to see effect on fit, should get wimp_rate_multiplier around 50:")
print(statistical_model.fit())

for signal_efficiency in [0,0.3,1,3]:
    print(statistical_model.get_expectation_values(signal_efficiency = signal_efficiency))

and outputs:

`Computing/loading models on one core: 100%|█| 2/2 [00:0
Computing/loading models on one core: 100%|█| 2/2 [00:0
INFO:root:initing simulator, binned: False
INFO:root:initing simulator, binned: False

set signal eff to see effect on fit, should get wimp_rate_multiplier around 50:
({'wimp_mass': 50.0, 'livetime_sr0': 0.2, 'livetime_sr1': 1.0, 'wimp_rate_multiplier': 45.81721355528466, 'er_rate_multiplier': 1.1432726668929618, 'signal_efficiency': 0.20000990901055393}, -3111.486710614569)
{'er': 240.0, 'wimp': 0.0}
{'er': 240.0, 'wimp': 3.6}
{'er': 240.0, 'wimp': 12.0}
{'er': 240.0, 'wimp': 36.0}
`

… efficiency parameters. This way, blueice will not cache pdfs for different values of these parameters
@kdund kdund requested a review from hammannr July 13, 2023 19:14
@kdund kdund added the enhancement New feature or request label Jul 13, 2023
@kdund kdund linked an issue Jul 13, 2023 that may be closed by this pull request
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit

pep8

alea/blueice_extended_model.py|160 col 28| WPS309 Found reversed compare order
alea/blueice_extended_model.py|160 col 29| E225 missing whitespace around operator
alea/blueice_extended_model.py|160 col 101| E501 line too long (140 > 100 characters)
alea/blueice_extended_model.py|161 col 1| S101 Use of assert detected. The enclosed code will be removed when compiling to optimised byte code.
alea/blueice_extended_model.py|161 col 101| E501 line too long (146 > 100 characters)
alea/blueice_extended_model.py|162 col 79| E231 missing whitespace after ','
alea/statistical_model.py|166 col 1| D102 Missing docstring in public method
alea/statistical_model.py|167 col 9| F841 local variable 'mus' is assigned to but never used

alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/statistical_model.py Show resolved Hide resolved
alea/statistical_model.py Outdated Show resolved Hide resolved
@hammannr
Copy link
Collaborator

One detail I just noticed: The Parameter attribute type is set via the kwarg ptype . I think since it’s an attribute of the parameter we don’t have to add the p in front of type so we can just also call the kwarg type . I don’t remember if there was some deeper thought behind this so if anyone remembers — please remind me 😄

alea/parameters.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
@hammannr
Copy link
Collaborator

@kdund I had a first quick look: runs nicely and does what it's supposed to do 😊 I'll have a more detailed look later.

alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Show resolved Hide resolved
Copy link
Collaborator

@hammannr hammannr left a comment

Choose a reason for hiding this comment

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

@kdund thanks a lot for adding this! 😊 I only have a few minor comments and some questions on parts that I don't fully understand

alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/statistical_model.py Outdated Show resolved Hide resolved
@hammannr hammannr linked an issue Jul 14, 2023 that may be closed by this pull request
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Show resolved Hide resolved
alea/blueice_extended_model.py Outdated Show resolved Hide resolved
@hammannr hammannr merged commit 7fd0d13 into nt_likelihood Jul 17, 2023
1 check passed
@hammannr hammannr deleted the nt_likelihood_efficiency branch July 17, 2023 07:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Check efficiency implementation in BlueiceExtendedModel Automatically assign extra_dont_hash_settings
2 participants