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

Update BetaYields #192

Merged
merged 208 commits into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
208 commits
Select commit Hold shift + click to select a range
86bd229
Change detector physics config defaults
HenningSE Oct 16, 2023
4057933
Change microphysics config defaults
HenningSE Oct 16, 2023
ce6cccd
Change PMT and DAQ config defaults
HenningSE Oct 16, 2023
86e0532
Add new context functions
HenningSE Oct 16, 2023
fe960ce
cleanup
HenningSE Oct 16, 2023
53d4c23
Merge branch 'main' into new_context
HenningSE Oct 16, 2023
655beee
Bump version: 0.1.1 → 0.2.0
HenningSE Oct 16, 2023
dc7e089
Update PMT Gain handling
HenningSE Oct 16, 2023
adcd1df
Update documentation
HenningSE Oct 17, 2023
a876439
Include some code from cutax
HenningSE Oct 17, 2023
1434a36
Calculate S1 LCE map from patternmap
HenningSE Oct 18, 2023
59752a6
Add _mc to s2_secondary_sc_gain config arg
HenningSE Oct 18, 2023
9f8e8e6
Set some default values
HenningSE Oct 18, 2023
be22d74
Update context in tests
HenningSE Oct 18, 2023
ae280aa
Update example notebooks with new context
HenningSE Oct 18, 2023
a789e13
bugfix in ElectronDrift
HenningSE Oct 19, 2023
f3c8543
Add S2 pattern map AFT scaling
HenningSE Oct 20, 2023
2394221
Update Documentation
HenningSE Oct 20, 2023
79053be
Cleanup
HenningSE Oct 20, 2023
563ef06
Cleanup
HenningSE Oct 20, 2023
ea0df7c
Bump version: 0.2.0 → 0.3.0
HenningSE Oct 20, 2023
2346125
Revert "Bump version: 0.2.0 → 0.3.0"
HenningSE Oct 20, 2023
0bda5d1
Bump version: 0.2.0 → 0.2.1
HenningSE Oct 20, 2023
84b4930
cache config args for better performance
HenningSE Oct 23, 2023
62b6de5
Use new strax.DownChunkingPlugin
HenningSE Oct 25, 2023
cf2ec61
Always save results of fast S1 & S2 plugins
HenningSE Oct 26, 2023
561afd6
Change default logging level to INFO
HenningSE Oct 26, 2023
0bd0a26
Increase propagated_s2_photons_file_size_target
HenningSE Oct 26, 2023
9152e99
Bump version: 0.2.1 → 0.2.2
HenningSE Oct 27, 2023
19d4738
get n_electron from binomial process
HenningSE Oct 27, 2023
aa26da8
Update documentation
HenningSE Oct 27, 2023
e28953d
Bump version: 0.2.2 → 0.2.3
HenningSE Oct 27, 2023
718dbf6
BugFix
HenningSE Oct 27, 2023
c38d039
return correct shaped zero array if empty input
HenningSE Oct 27, 2023
47fc3da
BugFix
HenningSE Oct 27, 2023
5626d29
Use np.around in waveform dtype conversion
HenningSE Nov 2, 2023
91a7ea1
Bump version: 0.2.3 → 0.2.4
HenningSE Nov 2, 2023
60f5b65
Remove interact. time offset + increase delay cut
HenningSE Nov 14, 2023
28a2e85
Bump version: 0.2.4 → 0.2.5
HenningSE Nov 14, 2023
b852fb5
Sort PMT AP photons by time
HenningSE Nov 27, 2023
4c38f36
Change PMTAfterPulses version number
HenningSE Nov 27, 2023
bf8dee9
Remove unused WFSim functions
HenningSE Nov 29, 2023
d17e65e
Rename __uniform_pe.. to spe_scaling_fact..
HenningSE Nov 29, 2023
4044318
Refactor pmt_transit_time_spread
HenningSE Nov 29, 2023
deb4ce2
Update plugin versions
HenningSE Nov 29, 2023
122f224
Bugfixing
HenningSE Nov 29, 2023
65debfe
Keep only photons with positive photon_gain
HenningSE Dec 1, 2023
daac410
update TPC volume plugins -> Remove primary positions
HenningSE Dec 18, 2023
20ab547
Remove cuts when reading the root file
HenningSE Dec 18, 2023
f3d1825
Remove primary positions from merge clusters
HenningSE Dec 18, 2023
ef2af5d
Add lineage clustering code draft
HenningSE Dec 18, 2023
5ea643c
Add periodictable to dependencies
HenningSE Dec 19, 2023
ab384f2
Add option to choose the clustering method when building the context
HenningSE Dec 19, 2023
40ed78e
Bugfix
HenningSE Dec 19, 2023
190521d
Disable energy cut when loading the root file
HenningSE Dec 20, 2023
8c4d8f6
Remove clusters with 0 energy deposit when merging the lineage
HenningSE Dec 20, 2023
7a524bf
Multiple updates to the lineage reconstruction
HenningSE Dec 20, 2023
a3f8829
Merge branch 'main' into lineage_clustering
HenningSE Feb 1, 2024
3394812
Merge branch 'main' into lineage_clustering
HenningSE Feb 5, 2024
c210bc5
Use base plugins for lineage clustering
HenningSE Feb 5, 2024
b78e3a3
Restructure
HenningSE Feb 7, 2024
c1078c0
Merge branch 'main' into lineage_clustering
HenningSE Feb 8, 2024
ede0295
Merge branch 'main' into lineage_clustering
HenningSE Feb 14, 2024
b71c3c1
Merge branch 'main' into lineage_clustering
HenningSE Feb 15, 2024
64451b2
Restructure lineage algorithm
HenningSE Feb 15, 2024
dfec258
Merge branch 'lineage_clustering' of https://github.com/XENONnT/fuse …
HenningSE Feb 15, 2024
eb91fc4
Fix function after merge commit
HenningSE Feb 15, 2024
d83b5dd
Dtype bugfixing
HenningSE Feb 15, 2024
45d4238
Remove zero energy deposits for dbscan clustering
HenningSE Feb 15, 2024
863cbd6
Merge branch 'main' into clustering_carlo
cfuselli Mar 15, 2024
9413411
input
cfuselli Mar 15, 2024
6da7b88
cluster id dtype problems fixed
cfuselli Mar 15, 2024
3f91272
small changes
cfuselli Mar 16, 2024
2b0d268
rebase input.py
cfuselli Mar 18, 2024
0360ead
working lineage
cfuselli Mar 18, 2024
c0b5780
add beta_brem
cfuselli Mar 18, 2024
056a00a
Merge branch 'main' into clustering_new_input
cfuselli Mar 18, 2024
cdc9806
remove main cluster from merged
cfuselli Mar 18, 2024
b93dd97
gammas were classified as ions
cfuselli Mar 18, 2024
33ca368
forgot print
cfuselli Mar 18, 2024
6b0d9f2
make beta yields plugin work
cfuselli Mar 19, 2024
a48b7d7
remove file with extra space
cfuselli Mar 19, 2024
7e6b03b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 19, 2024
1ac2c52
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 19, 2024
5b19ab4
Merge branch 'main' into lineage_clustering
ramirezdiego Mar 19, 2024
33444fb
Merge branch 'main' into beta_yields
ramirezdiego Mar 19, 2024
092b09f
fix microphysics only context
cfuselli Mar 19, 2024
1f31703
cleanup lineage cluster
cfuselli Mar 19, 2024
cc1d6ba
cleanup
cfuselli Mar 19, 2024
63ebf6e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 19, 2024
a0d3e34
cleanup
cfuselli Mar 19, 2024
065e129
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 19, 2024
ecbd2de
cleanup
cfuselli Mar 19, 2024
ab83cff
Merge branch 'lineage_clustering' of github.com:cfuselli/fuse into li…
cfuselli Mar 19, 2024
0d0af23
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 19, 2024
b7947e9
Merge branch 'main' into lineage_clustering
ramirezdiego Mar 20, 2024
ce15d78
Merge branch 'main' into beta_yields
ramirezdiego Mar 20, 2024
e897b0c
Merge branch 'main' into pr/167
HenningSE Apr 8, 2024
0b1d0f3
Merge branch 'main' into pr/168
HenningSE Apr 8, 2024
2ad3e84
Add periodictable to requirements
HenningSE Apr 8, 2024
f215f5f
Merge branch 'main' into pr/167
HenningSE Apr 10, 2024
d18a2fe
Common place to define some dtypes and bugfixing
HenningSE Apr 10, 2024
a12033c
Save primary positions again
HenningSE Apr 10, 2024
f6eadac
Bugfixing
HenningSE Apr 10, 2024
f5cf073
Add test for lineage clustering plugins
HenningSE Apr 10, 2024
53293d9
Merge branch 'main' into pr/167
HenningSE Apr 10, 2024
bc09732
Merge branch 'main' into pr/168
HenningSE Apr 10, 2024
91a4f15
Merge branch 'main' into pr/167
HenningSE Apr 11, 2024
8ced1cc
set pri positions in MergeLineage
HenningSE Apr 15, 2024
b9105ab
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 15, 2024
9ceb23d
Remove empty TPC events
HenningSE Apr 15, 2024
125c368
Merge branch 'lineage_clustering' of https://github.com/cfuselli/fuse…
HenningSE Apr 15, 2024
a7c8552
Remove empty events
HenningSE Apr 15, 2024
7f3bd2d
Fix some typo
HenningSE Apr 15, 2024
c439025
Add docstrings
HenningSE Apr 15, 2024
734f290
Bump some plugin versions
HenningSE Apr 15, 2024
083b8a5
Merge branch 'main' into lineage_clustering
HenningSE Apr 16, 2024
36b11e6
Merge branch 'pr/168' into beta_yields
HenningSE Apr 16, 2024
3cb9998
Update plugin config arguments
HenningSE Apr 16, 2024
86ed75b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 16, 2024
f9e7fbb
rename g1 and g2
HenningSE Apr 16, 2024
a6226a5
Merge branch 'beta_yields' of https://github.com/XENONnT/fuse into be…
HenningSE Apr 16, 2024
01c428f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 16, 2024
1aa2745
Remove pickle import
HenningSE Apr 16, 2024
e467c69
Add test for BetaYield plugin
HenningSE Apr 16, 2024
a65499f
Update exception_message
HenningSE Apr 16, 2024
5a83006
Use same defaults for g1g2 as straxen EnergyEstimates
HenningSE Apr 16, 2024
c2cc1af
Merge branch 'main' into beta_yields
HenningSE Apr 18, 2024
e1f996b
Merge branch 'main' into lineage_clustering
HenningSE Apr 18, 2024
a266b36
Merge branch 'main' into lineage_clustering
HenningSE Apr 19, 2024
c383fd8
Merge branch 'main' into lineage_clustering
HenningSE Apr 19, 2024
da39d9b
Remove clustered_interactions_dtype
HenningSE Apr 19, 2024
d8dd429
Update dtypes
HenningSE Apr 19, 2024
a163bda
Merge branch 'main' into beta_yields
HenningSE Apr 19, 2024
6f5377a
Bugfixing
HenningSE Apr 19, 2024
58561eb
Debug
HenningSE Apr 19, 2024
aa4cb08
Bugfix
HenningSE Apr 19, 2024
251666a
Bugfixing
HenningSE Apr 19, 2024
edc4e46
Even more bug fixing....
HenningSE Apr 19, 2024
36b5eeb
Merge branch 'main' into lineage_clustering
HenningSE Apr 24, 2024
b9a144a
efficient mem chunking in input plugin
cfuselli Apr 30, 2024
cb32629
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 30, 2024
7d6a8df
fix time and t bug and dtype
cfuselli Apr 30, 2024
6adc394
fix time and t bug and dtype
cfuselli Apr 30, 2024
5ae341e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 30, 2024
727738e
forgot import function from common..
cfuselli Apr 30, 2024
c0d97e9
erge branch 'mem_eff_input' of github.com:XENONnT/fuse into mem_eff_i…
cfuselli Apr 30, 2024
14f735c
fix bug
cfuselli Apr 30, 2024
993ec6d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 30, 2024
b097828
Merge branch 'main' into lineage_clustering
ramirezdiego Apr 30, 2024
ba38c01
empty tpc events handling
cfuselli Apr 30, 2024
2724fed
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 30, 2024
7cf10cd
whitespace
cfuselli Apr 30, 2024
39b66fb
Merge branch 'mem_eff_input' of github.com:XENONnT/fuse into mem_eff_…
cfuselli Apr 30, 2024
42ab3ca
allow empty chunk
cfuselli Apr 30, 2024
d95b5c9
one last chance
cfuselli Apr 30, 2024
293abc0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 30, 2024
d5a198e
Merge branch 'main' into mem_eff_input
HenningSE May 3, 2024
793663b
Merge branch 'main' into lineage_clustering
HenningSE May 3, 2024
00350a2
Bugfixing
HenningSE May 23, 2024
1ba74ca
Merge branch 'lineage_clustering' of https://github.com/XENONnT/fuse …
HenningSE May 23, 2024
ba07114
Merge branch 'main' into lineage_clustering
ramirezdiego May 24, 2024
9eddf2d
float to int in compare boundaries
cfuselli May 29, 2024
f626d52
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 29, 2024
4bbc197
better sorting on float times
cfuselli May 29, 2024
497dc20
Merge branch 'mem_eff_input' of github.com:XENONnT/fuse into mem_eff_…
cfuselli May 29, 2024
2dca721
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 29, 2024
9234938
Merge branch 'main' into mem_eff_input
cfuselli May 30, 2024
31862b4
fix preselection cut
cfuselli May 30, 2024
569d383
Merge branch 'mem_eff_input' of github.com:XENONnT/fuse into mem_eff_…
cfuselli May 30, 2024
f619649
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 30, 2024
ad7fa7e
Merge branch 'main' into lineage_clustering
cfuselli May 30, 2024
b0b06d4
Merge branch 'main' into lineage_clustering
ramirezdiego Jun 4, 2024
57aacff
Merge branch 'main' into mem_eff_input
ramirezdiego Jun 4, 2024
3e79391
Merge branch 'main' into mem_eff_input
ramirezdiego Jun 6, 2024
cab551b
Merge branch 'main' into mem_eff_input
ramirezdiego Jun 6, 2024
812278f
Typo
ramirezdiego Jun 7, 2024
3562477
Merge branch 'main' into lineage_clustering
ramirezdiego Jun 9, 2024
9c0e98d
from cs1/cs2 to n_ph/n_e and make dummy function for test
cfuselli Jun 10, 2024
6de7194
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 10, 2024
1b0b0e9
fix missing import and avoid lambda func
cfuselli Jun 10, 2024
13733ec
function needs to be picklable
cfuselli Jun 10, 2024
731bea6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 10, 2024
942f324
docstring
cfuselli Jun 10, 2024
57d8a5d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 10, 2024
fdfb057
Merge branch 'main' into mem_eff_input
ramirezdiego Jun 10, 2024
4f79c1f
Merge branch 'main' into lineage_clustering
ramirezdiego Jun 10, 2024
ae80e9a
Merge branch 'main' into beta_yields
cfuselli Jun 11, 2024
ef35d78
Merge pull request #5 from XENONnT/mem_eff_input
cfuselli Jun 11, 2024
1adaef4
Merge pull request #6 from XENONnT/lineage_clustering
cfuselli Jun 11, 2024
e905417
Merge pull request #7 from XENONnT/beta_yields
cfuselli Jun 11, 2024
c7f9d97
Merge branch 'main' into lineage_clustering
HenningSE Jun 24, 2024
04b09d6
needs to be two functions to be picklable
cfuselli Jun 24, 2024
a110d2c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 24, 2024
b289cd0
Merge branch 'main' into lineage_clustering
ramirezdiego Jun 24, 2024
16d42ce
Merge branch 'main' into beta_yields
cfuselli Jun 24, 2024
aca7c7d
fix bug on cut_delay
cfuselli Jun 25, 2024
8395402
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 25, 2024
5905a6e
Merge branch 'main' into lineage_clustering
HenningSE Jun 25, 2024
472c6cc
do cut delay directly on interactions
cfuselli Jun 25, 2024
3707aaf
Merge branch 'lineage_clustering' of github.com:XENONnT/fuse into lin…
cfuselli Jun 25, 2024
c5fc21d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 25, 2024
46b48b6
Merge branch 'all-together' into lineage_clustering
cfuselli Jun 25, 2024
48ea945
Merge pull request #9 from XENONnT/lineage_clustering
cfuselli Jun 25, 2024
9d16442
Merge branch 'all-together' into beta_yields
cfuselli Jun 25, 2024
d3ae87f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 25, 2024
c70a7b2
Merge branch 'main' into beta_yields
ramirezdiego Jun 27, 2024
9302d17
Update test_MicroPhysics_alt_Yields.py
cfuselli Jun 27, 2024
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
5 changes: 3 additions & 2 deletions fuse/plugins/micro_physics/yields.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,10 @@ def get_quanta(self, interactions_in_roi):
def quanta_from_spline(self, energy):

with open(self.beta_quanta_spline, "rb") as f:
quanta_function = pickle.load(f)
cs1_poly, cs2_poly = pickle.load(f)

beta_photons, beta_electrons = quanta_function(energy)
beta_photons = cs1_poly(energy)
beta_electrons = cs2_poly(energy)

if self.use_recombination_fluctuation:

Expand Down
4 changes: 2 additions & 2 deletions tests/test_MicroPhysics_alt_Yields.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def yields_dummy_func(x):
To be used as a dummy function for the BetaYields plugin. Needs to
be defined outside the test class to be picklable.
"""
return 40, 30
return 20000


class TestAlternativeYields(unittest.TestCase):
Expand Down Expand Up @@ -62,7 +62,7 @@ def test_BetaYields(self):
# as a function of energy
spline_func_name = os.path.join(self.temp_dir.name, "beta_quanta_spline.pkl")
with open(spline_func_name, "wb") as f:
pickle.dump(yields_dummy_func, f)
pickle.dump((yields_dummy_func, yields_dummy_func), f)

self.test_context.set_config({"beta_quanta_spline": spline_func_name})

Expand Down