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.

Sign up for GitHub

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

First runner manipulating statistical model #50

Merged
merged 27 commits into from
Aug 4, 2023
Merged

First runner manipulating statistical model #50

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
232c6de
Recover runner
dachengx Jul 21, 2023
628d452
Improve code style
dachengx Jul 21, 2023
cc0d06e
Minor change
dachengx Jul 21, 2023
f869822
Merge remote-tracking branch 'origin/main' into first_runner
dachengx Jul 22, 2023
0e334dd
Remove duplicated codes
dachengx Jul 22, 2023
f4c063e
Merge remote-tracking branch 'origin/main' into first_runner
dachengx Jul 28, 2023
4fb9113
Simplify toydata mode
dachengx Jul 31, 2023
d31d4bc
Add test_runner.py
dachengx Jul 31, 2023
80e0dd6
Happier code style
dachengx Jul 31, 2023
2c624dc
Minor change
dachengx Jul 31, 2023
06ad8f3
Help model to save dict data and list data in a unified function
dachengx Jul 31, 2023
5104568
Happier code style
dachengx Jul 31, 2023
dec5ca0
Minor change at docstring
dachengx Aug 1, 2023
3823458
Minor change
dachengx Aug 1, 2023
c0e69ff
Confidential interval calculation
dachengx Aug 1, 2023
8f22c0c
Happier code style
dachengx Aug 1, 2023
a1b82fe
Merge remote-tracking branch 'origin/main' into first_runner
dachengx Aug 1, 2023
345f976
Merge branch 'main' into first_runner
dachengx Aug 1, 2023
9e5c79f
Set sigma as not fittable otherwise horrible things when CL calculati…
dachengx Aug 1, 2023
89c0bd3
Remove todo of runner because it is done
dachengx Aug 1, 2023
b710149
Make the placeholder is already an OK gaussian model example
dachengx Aug 1, 2023
9215c9c
Few change, add warnings and improve performance
dachengx Aug 2, 2023
9a577e3
Convert the data generation of runner into a generator
dachengx Aug 2, 2023
7958d71
More compact data generator
dachengx Aug 2, 2023
6bab21b
Also specify what if toydata_mode is no_toydata
dachengx Aug 3, 2023
3dbaa98
Warning when parameter_interval_bounds contains None
dachengx Aug 4, 2023
f35e0c7
Update docstring a bit
dachengx Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions alea/blueice_extended_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def _build_ll_from_config(self, likelihood_config: dict) -> "LogLikelihoodSum":
for i, source in enumerate(config["sources"]):
parameters_to_ignore: List[str] = [
p.name for p in self.parameters if (
p.ptype == "shape") & (p.name not in source["parameters"])]
p.ptype == "shape") and (p.name not in source["parameters"])]
# no efficiency affects PDF:
parameters_to_ignore += [p.name for p in self.parameters if (p.ptype == "efficiency")]
parameters_to_ignore += source.get("extra_dont_hash_settings", [])
Expand All @@ -134,7 +134,6 @@ def _build_ll_from_config(self, likelihood_config: dict) -> "LogLikelihoodSum":
ll = likelihood_object(blueice_config)

for source in config["sources"]:

# Set rate parameters
rate_parameters = [
p for p in source["parameters"] if self.parameters[p].ptype == "rate"]
Expand Down
Loading