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

Iterative Bayesian 3D (t, x, y) S2 merging #1513

Merged
merged 54 commits into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
4295cee
Iterative Bayesian 3D (t, x, y) S2 merging
dachengx Jan 7, 2025
4309dea
Debug
dachengx Jan 7, 2025
c99ba7c
Debug
dachengx Jan 7, 2025
fcb95b6
Simplify
dachengx Jan 7, 2025
f361eed
Use area in top array as the weights
dachengx Jan 7, 2025
bf2d046
Debug
dachengx Jan 8, 2025
8d284bd
Filter out negative or nan
dachengx Jan 8, 2025
db5f520
Debug, use `start_index` and `end_index` always as the indices of merged
dachengx Jan 8, 2025
207e0c7
Merge branch 'merged_s2s_3d' of github.com:XENONnT/straxen into merge…
dachengx Jan 8, 2025
e3ff3c4
Debug
dachengx Jan 8, 2025
499799a
Debug
dachengx Jan 9, 2025
7b74fc9
Merge branch 'master' into merged_s2s_3d
dachengx Jan 10, 2025
d315d41
Minor change
dachengx Jan 11, 2025
edfd1ea
Reduce storage usage by creating `"enhanced_peaklet_classification"` …
dachengx Jan 12, 2025
6b2b176
Add important comments
dachengx Jan 12, 2025
a2a44cd
Merge branch 'master' into merged_s2s_3d
dachengx Jan 12, 2025
96fb695
Debug
dachengx Jan 12, 2025
ce21308
Exclude non-positive-area peaklets
dachengx Jan 13, 2025
fd4a60e
Be compatible with HE plugins
dachengx Jan 13, 2025
d29cac8
Merge branch 'master' into merged_s2s_3d
dachengx Jan 14, 2025
1fbf762
Merge branch 'master' into merged_s2s_3d
dachengx Jan 14, 2025
98a295d
Add URLconfig option and code to use contour area for weights (#1526)
juehang Jan 17, 2025
e254722
Add options to merge S0
dachengx Jan 18, 2025
33b6c41
Mark peaks buried in type 20 as type 22
dachengx Jan 18, 2025
4fadddb
Have to consider whether merging S0 in `peaks` plugin
dachengx Jan 19, 2025
9886305
Remove process bar
dachengx Jan 19, 2025
7f6bb39
Do not load position_contour_cnf if do not use uncertainty weights
dachengx Jan 19, 2025
9ff08a0
Set p-thresholds depends on S2 area
dachengx Jan 19, 2025
35bd086
Have to reduce number of binning to make calculation faster
dachengx Jan 19, 2025
4cdeb2d
Merge remote-tracking branch 'origin/master' into merged_s2s_3d
dachengx Jan 19, 2025
ecc7188
Remove `FAKE_MERGED_S2_TYPE`
dachengx Jan 19, 2025
a65b010
Merge remote-tracking branch 'origin/master' into merged_s2s_3d
dachengx Jan 19, 2025
c5fddd2
Small bug fix
dachengx Jan 20, 2025
d56d464
Merge S0 only if there are `merged_s2s` and S0
dachengx Jan 20, 2025
039a550
Add flag about whether remove sparse peaklets in (x, y)
dachengx Jan 22, 2025
1b52e0d
Merge branch 'master' into merged_s2s_3d
dachengx Jan 23, 2025
f9b57c9
Use `area_decile_from_midpoint` as approximation
dachengx Jan 23, 2025
e711532
Merge remote-tracking branch 'origin/master' into merged_s2s_3d
dachengx Jan 23, 2025
f6dd04c
Use `position_contour_area_cnf` from `peaklet_positions_cnf`
dachengx Jan 23, 2025
75d0351
Merge branch 'master' into merged_s2s_3d
dachengx Jan 25, 2025
c1f7f68
S2-dependent average dr definition
dachengx Jan 25, 2025
2ebede9
Tolerate more PI on larger S2
dachengx Jan 26, 2025
1f60436
Merge branch 'master' into merged_s2s_3d
dachengx Jan 26, 2025
825bab5
Merge negative peak in time but not in (x, y)
dachengx Jan 26, 2025
baabe7e
Do not set r threshold for large S2
dachengx Jan 26, 2025
c2e576f
Merge branch 'master' into merged_s2s_3d
dachengx Jan 31, 2025
7ec10fb
Merge branch 'master' into merged_s2s_3d
dachengx Feb 2, 2025
d07e433
Merge branch 'master' into merged_s2s_3d
dachengx Feb 3, 2025
202bc7d
Merge branch 'master' into merged_s2s_3d
GiovanniVolta Feb 3, 2025
d8297a6
Merge remote-tracking branch 'origin/master' into merged_s2s_3d
dachengx Feb 5, 2025
d4858c4
Add option to avoid aggressive merging
dachengx Feb 6, 2025
fc375f6
Do not withdraw aggressive merging
dachengx Feb 6, 2025
69159e8
Use the merging based on gaps between peaklets as pre-selection
dachengx Feb 6, 2025
5b33d1c
Fine tune thresholds
dachengx Feb 6, 2025
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
1 change: 1 addition & 0 deletions straxen/plugins/defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@
}

FAKE_MERGED_S2_TYPE = -42
WIDE_XYPOS_S2_TYPE = 20
2 changes: 2 additions & 0 deletions straxen/plugins/events/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ def get_window_size(self):
def _is_triggering(self, peaks):
_is_triggering = peaks["area"] > self.trigger_min_area
_is_triggering &= peaks["n_competing"] <= self.trigger_max_competing
_is_triggering &= np.isin(peaks["type"], [1, 2])
# have to consider the peak with type 20
if self.exclude_s1_as_triggering_peaks:
_is_triggering &= peaks["type"] == 2
else:
Expand Down
Loading
Loading