Skip to content

fix: make sure coord remains after binnning #254

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

Open
jokasimr wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: make sure coord remains after binnning #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d3af21
fix: make sure coord remains after binnning
jokasimr Mar 3, 2026
e525a3b
test: skip if cif-db not reachable
jokasimr Mar 3, 2026
e09ee62
Merge branch 'main' into fix-beer-3d
jokasimr Mar 3, 2026
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: 3 additions & 0 deletions src/ess/beer/clustering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ def cluster_events_by_streak(
# adding them to the binned data coords achieves this.
for coord in ('two_theta', 'Ltotal'):
da.bins.coords[coord] = sc.bins_like(da, da.coords[coord])
# Making them scalar also keeps them after binning,
# but without having to store them for each event.
da.coords['tc'] = da.coords['tc'].mean()
Copy link
Member

@jl-wynen jl-wynen Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why can we just use the mean here? Shouldn't this be a per-cluster coord?


h = da.bins.concat().hist(coarse_d=1000)
i_peaks, _ = find_peaks(
Expand Down
21 changes: 21 additions & 0 deletions tests/diffraction/test_peaks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
import urllib.request

import pytest
import scipp as sc

from ess.diffraction.peaks import dspacing_peaks_from_cif


def _cifdb_is_reachable(timeout=5):
try:
req = urllib.request.Request('http://cod.ibt.lt', method="HEAD")
with urllib.request.urlopen(req, timeout=timeout): # noqa: S310
return True
except Exception:
return False


@pytest.mark.skipif(
not _cifdb_is_reachable(), reason='The CIF database can not be reached.'
)
def test_retreived_peak_list_has_expected_units():
d = dspacing_peaks_from_cif(
'codid::9011998',
Expand All @@ -12,6 +27,9 @@ def test_retreived_peak_list_has_expected_units():
assert d.unit == 'barn'


@pytest.mark.skipif(
not _cifdb_is_reachable(), reason='The CIF database can not be reached.'
)
def test_intensity_threshold_is_taken_into_account():
d = dspacing_peaks_from_cif(
'codid::9011998',
Expand All @@ -26,6 +44,9 @@ def test_intensity_threshold_is_taken_into_account():
assert len(d) == 0


@pytest.mark.skipif(
not _cifdb_is_reachable(), reason='The CIF database can not be reached.'
)
def test_retreived_peak_list_with_temperature_kwarg():
d = dspacing_peaks_from_cif(
'codid::9011998', sc.scalar(50, unit='barn'), uiso_temperature=300
Expand Down
Loading