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

Simplify TemplateSource, CombinedSource and SpectrumTemplateSource #69

Merged
merged 25 commits into from
Aug 16, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ec0bc27
Simplify TemplateSource
dachengx Jul 31, 2023
cd0a594
Update settings of utils, add SR2 to demo CombinedSource
dachengx Jul 31, 2023
1f9251b
Minor change
dachengx Jul 31, 2023
789e3f2
Set numpy version to less than 1.23.0
dachengx Jul 31, 2023
e1aac2a
Update docstring to Google style
dachengx Jul 31, 2023
ef53ff8
Check needed weighted parameters of CombinedSource
dachengx Aug 1, 2023
459c93b
Update docstring
dachengx Aug 1, 2023
e1cf100
Merge remote-tracking branch 'origin/main' into simplify_source
dachengx Aug 1, 2023
698e0ba
No need to use multiple inheritance
dachengx Aug 1, 2023
c7252e8
Merge branch 'main' into simplify_source
dachengx Aug 1, 2023
462fb5b
Raise error when there is no key in the json file
dachengx Aug 2, 2023
20b53de
Merge remote-tracking branch 'origin/main' into simplify_source
dachengx Aug 4, 2023
de2044d
Recover logging, update docstring
dachengx Aug 4, 2023
07fb1c0
Kill cache of coverage
dachengx Aug 4, 2023
6fd9c19
Test SpectrumTemplateSource
dachengx Aug 6, 2023
1356abb
Demo future callable uncertainty
dachengx Aug 6, 2023
52c2681
Use latest numpy
dachengx Aug 8, 2023
bf29d49
Rename histogram_multiplier to histogram_scale_factor
dachengx Aug 10, 2023
c2b0cf3
Merge remote-tracking branch 'origin/main' into simplify_source
dachengx Aug 16, 2023
b3955f3
Test template source separately in another test module
dachengx Aug 16, 2023
b063d6e
Remove double quotes if not necessary
dachengx Aug 16, 2023
4f5508a
Forget to upload this file
dachengx Aug 16, 2023
68d2a2a
tiny typo
kdund Aug 16, 2023
72b4e17
tiny docstring change
kdund Aug 16, 2023
acbd7db
Fix little typo
dachengx Aug 16, 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
38 changes: 38 additions & 0 deletions alea/examples/configs/unbinned_wimp_statistical_model.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ parameter_definition:
fittable: false
description: Livetime of SR1 in years

livetime_sr2:
nominal_value: 0.5
fittable: false
description: Livetime of SR1 in years

wimp_rate_multiplier:
nominal_value: 1.0
ptype: rate
Expand Down Expand Up @@ -127,3 +132,36 @@ likelihood_config:
template_filename: wimp50gev_template.h5
apply_efficiency: True
efficiency_name: signal_efficiency

# SR2
- name: sr2
default_source_class: alea.template_source.TemplateSource
likelihood_type: blueice.likelihood.UnbinnedLogLikelihood
analysis_space:
- "cs1": 'np.arange(0, 102, 2)'
kdund marked this conversation as resolved.
Show resolved Hide resolved
- "cs2": 'np.geomspace(100, 100000, 51)'
in_events_per_bin: true
livetime_parameter: livetime_sr2
slice_args: {}
sources:
- name: er
class: alea.template_source.CombinedSource
parameters:
- er_rate_multiplier
weight_1: 0.2
weight_-1: 0.3
weight_names: [weight_1, weight_-1]
histnames: [er_template, er_template, er_template,]
template_filenames: [er_template_0.h5, er_template_1.h5, er_template_-1.h5]
histogram_multiplier: 200
histogram_scale_factor: 3

- name: wimp
histname: wimp_template
parameters:
- wimp_rate_multiplier
- wimp_mass
- signal_efficiency
template_filename: wimp50gev_template.h5
apply_efficiency: True
efficiency_name: signal_efficiency
Loading
Loading