Merge pull request #132 from scipp/zw-figure-fix

Zw figure fix

Author: jokasimr

src/ess/reflectometry/normalization.py

@@ -79,9 +79,7 @@ def reduce_sample_over_zw(
 
     Returns reflectivity as a function of ``blade``, ``wire`` and :math:`\\wavelength`.
     """
-    R = sample.bins.concat(('stripe',)).bin(wavelength=wbins) / reference.data
-    R.masks["too_few_events"] = reference.data < sc.scalar(1, unit="counts")
-    return R
+    return sample.bins.concat(('stripe',)).bin(wavelength=wbins) / reference.data
 
 
 providers = (

tests/reflectometry/__init__.py

@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2025 Scipp contributors (https://github.com/scipp)

tests/reflectometry/normalization_test.py

@@ -0,0 +1,56 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2025 Scipp contributors (https://github.com/scipp)
+import numpy as np
+import pytest
+import scipp as sc
+
+from ess.reflectometry.normalization import reduce_sample_over_zw
+
+
+@pytest.fixture
+def sample(request):
+    n = 50
+    da = sc.DataArray(
+        data=sc.ones(dims=('events',), shape=(n,)),
+        coords={
+            'wavelength': sc.linspace('events', 1, 5, n),
+            'wire': sc.array(dims=('events',), values=np.random.randint(0, 5, n)),
+            'stripe': sc.array(dims=('events',), values=np.random.randint(0, 10, n)),
+        },
+    )
+    return da.group('wire', 'stripe')
+
+
+@pytest.fixture
+def reference(request):
+    n = 50
+    da = sc.DataArray(
+        data=sc.ones(dims=('events',), shape=(n,)),
+        coords={
+            'wavelength': sc.linspace('events', 1, 5, n),
+            'wire': sc.array(dims=('events',), values=np.random.randint(0, 5, n)),
+            'stripe': sc.array(dims=('events',), values=np.random.randint(0, 10, n)),
+        },
+    )
+    return da.group('wire').bin(wavelength=2).bins.sum()
+
+
+def test_reduce_sample_over_zw_when_data_not_dimensionless(sample, reference):
+    sample = sample.copy(deep=True)
+    sample.bins.unit = '1/s'
+    reduce_sample_over_zw(
+        sample,
+        reference,
+        reference.coords['wavelength'],
+    )
+
+
+def test_reduce_sample_over_zw_has_expected_coords(sample, reference):
+    r = reduce_sample_over_zw(
+        sample,
+        reference,
+        reference.coords['wavelength'],
+    )
+    assert r.dims == reference.dims
+    assert r.shape == reference.shape
+    assert not (sample.bins is None) ^ (r.bins is None)