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

Bump merged_s2s version following strax.merge_peaks #1179

Merged
merged 1 commit into from
May 9, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions straxen/plugins/merged_s2s/merged_s2s.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class MergedS2s(strax.OverlapWindowPlugin):
Merge together peaklets if peak finding favours that they would
form a single peak instead.
"""
__version__ = '1.0.1'
__version__ = '1.0.2'

depends_on = ('peaklets', 'peaklet_classification', 'lone_hits')
data_kind = 'merged_s2s'
Expand Down Expand Up @@ -102,7 +102,10 @@ def compute(self, peaklets, lone_hits):
max_gap=max_gap,
max_area=max_area,
)
assert 'data_top' in peaklets.dtype.names
if (end_merge_at - start_merge_at).min() <= 1:
raise ValueError('Found merging only 1 peak')

assert 'data_top' in peaklets.dtype.names

merged_s2s = strax.merge_peaks(
peaklets,
Expand Down