essreduce 25.4.0__tar.gz → 25.4.1__tar.gz

{essreduce-25.4.0/src/essreduce.egg-info → essreduce-25.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: essreduce
-Version: 25.4.0
+Version: 25.4.1
 Summary: Common data reduction tools for the ESS facility
 Author: Scipp contributors
 License: BSD 3-Clause License
@@ -51,7 +51,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: sciline>=24.06.2
+Requires-Dist: sciline>=25.04.1
 Requires-Dist: scipp>=25.01.0
 Requires-Dist: scippneutron>=25.02.0
 Requires-Dist: scippnexus>=24.11.0

{essreduce-25.4.0 → essreduce-25.4.1}/pyproject.toml

@@ -31,7 +31,7 @@ requires-python = ">=3.10"
 # Run 'tox -e deps' after making changes here. This will update requirement files.
 # Make sure to list one dependency per line.
 dependencies = [
-    "sciline>=24.06.2",
+    "sciline>=25.04.1",
     "scipp>=25.01.0",
     "scippneutron>=25.02.0",
     "scippnexus>=24.11.0",

{essreduce-25.4.0 → essreduce-25.4.1}/requirements/base.in

@@ -1,10 +1,8 @@
 # Anything above "--- END OF CUSTOM SECTION ---"
 # will not be touched by ``make_base.py``
-# Numba, which is used in basetest, requires numpy<2.2
-numpy<2.2
 # --- END OF CUSTOM SECTION ---
 # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
-sciline>=24.06.2
+sciline>=25.04.1
 scipp>=25.01.0
 scippneutron>=25.02.0
 scippnexus>=24.11.0

{essreduce-25.4.0 → essreduce-25.4.1}/requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:bdbd868df28038a5e78614cb84a37acdf033872c
+# SHA1:082d6bf55d8a06cdc1dd3a0a78dd31c318c26424
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -17,7 +17,7 @@ dnspython==2.7.0
     # via email-validator
 email-validator==2.2.0
     # via scippneutron
-fonttools==4.56.0
+fonttools==4.57.0
     # via matplotlib
 h5py==3.13.0
     # via
@@ -39,9 +39,8 @@ mpltoolbox==24.5.1
     # via scippneutron
 networkx==3.4.2
     # via cyclebane
-numpy==2.1.3
+numpy==2.2.4
     # via
-    #   -r base.in
     #   contourpy
     #   h5py
     #   matplotlib
@@ -57,9 +56,9 @@ pillow==11.1.0
     # via matplotlib
 plopp==25.3.0
     # via scippneutron
-pydantic==2.11.1
+pydantic==2.11.3
     # via scippneutron
-pydantic-core==2.33.0
+pydantic-core==2.33.1
     # via pydantic
 pyparsing==3.2.3
     # via matplotlib
@@ -68,7 +67,7 @@ python-dateutil==2.9.0.post0
     #   matplotlib
     #   scippneutron
     #   scippnexus
-sciline==24.10.0
+sciline==25.4.1
     # via -r base.in
 scipp==25.4.0
     # via
@@ -87,10 +86,11 @@ scipy==1.15.2
     #   scippnexus
 six==1.17.0
     # via python-dateutil
-typing-extensions==4.13.0
+typing-extensions==4.13.1
     # via
     #   pydantic
     #   pydantic-core
+    #   sciline
     #   typing-inspection
 typing-inspection==0.4.0
     # via pydantic

{essreduce-25.4.0 → essreduce-25.4.1}/requirements/basetest.txt

@@ -25,7 +25,7 @@ exceptiongroup==1.2.2
     #   pytest
 executing==2.2.0
     # via stack-data
-fonttools==4.56.0
+fonttools==4.57.0
     # via matplotlib
 idna==3.10
     # via requests
@@ -33,7 +33,7 @@ importlib-resources==6.5.2
     # via tof
 iniconfig==2.1.0
     # via pytest
-ipython==8.34.0
+ipython==8.35.0
     # via ipywidgets
 ipywidgets==8.1.5
     # via -r basetest.in
@@ -51,9 +51,9 @@ matplotlib==3.10.1
     # via plopp
 matplotlib-inline==0.1.7
     # via ipython
-numba==0.61.0
+numba==0.61.2
     # via -r basetest.in
-numpy==2.1.3
+numpy==2.2.4
     # via
     #   contourpy
     #   matplotlib
@@ -116,7 +116,7 @@ traitlets==5.14.3
     #   ipython
     #   ipywidgets
     #   matplotlib-inline
-typing-extensions==4.13.0
+typing-extensions==4.13.1
     # via ipython
 urllib3==2.3.0
     # via requests

{essreduce-25.4.0 → essreduce-25.4.1}/requirements/ci.txt

@@ -50,7 +50,7 @@ tomli==2.2.1
     #   tox
 tox==4.25.0
     # via -r ci.in
-typing-extensions==4.13.0
+typing-extensions==4.13.1
     # via tox
 urllib3==2.3.0
     # via requests

{essreduce-25.4.0 → essreduce-25.4.1}/requirements/dev.txt

@@ -48,7 +48,7 @@ isoduration==20.11.0
     # via jsonschema
 jinja2-ansible-filters==1.3.2
     # via copier
-json5==0.11.0
+json5==0.12.0
     # via jupyterlab-server
 jsonpointer==3.0.0
     # via jsonschema
@@ -69,7 +69,7 @@ jupyter-server==2.15.0
     #   notebook-shim
 jupyter-server-terminals==0.5.3
     # via jupyter-server
-jupyterlab==4.3.6
+jupyterlab==4.4.0
     # via -r dev.in
 jupyterlab-server==2.27.3
     # via jupyterlab

{essreduce-25.4.0 → essreduce-25.4.1}/requirements/docs.txt

@@ -60,7 +60,7 @@ importlib-resources==6.5.2
     # via tof
 ipykernel==6.29.5
     # via -r docs.in
-ipython==8.34.0
+ipython==8.35.0
     # via
     #   -r docs.in
     #   ipykernel
@@ -154,7 +154,7 @@ pygments==2.19.1
     #   sphinx
 pyyaml==6.0.2
     # via myst-parser
-pyzmq==26.3.0
+pyzmq==26.4.0
     # via
     #   ipykernel
     #   jupyter-client

{essreduce-25.4.0 → essreduce-25.4.1}/requirements/nightly.txt

@@ -38,7 +38,7 @@ exceptiongroup==1.2.2
     #   pytest
 executing==2.2.0
     # via stack-data
-fonttools==4.56.0
+fonttools==4.57.0
     # via matplotlib
 h5py==3.13.0
     # via
@@ -52,7 +52,7 @@ importlib-resources==6.5.2
     # via tof
 iniconfig==2.1.0
     # via pytest
-ipython==8.34.0
+ipython==8.35.0
     # via ipywidgets
 ipywidgets==8.1.5
     # via -r nightly.in
@@ -78,7 +78,7 @@ mpltoolbox==24.5.1
     # via scippneutron
 networkx==3.4.2
     # via cyclebane
-numba==0.61.1rc1
+numba==0.61.2
     # via -r nightly.in
 numpy==2.2.4
     # via
@@ -118,9 +118,9 @@ ptyprocess==0.7.0
     # via pexpect
 pure-eval==0.2.3
     # via stack-data
-pydantic==2.11.1
+pydantic==2.11.3
     # via scippneutron
-pydantic-core==2.33.0
+pydantic-core==2.33.1
     # via pydantic
 pygments==2.19.1
     # via ipython
@@ -169,11 +169,12 @@ traitlets==5.14.3
     #   ipython
     #   ipywidgets
     #   matplotlib-inline
-typing-extensions==4.13.0
+typing-extensions==4.13.1
     # via
     #   ipython
     #   pydantic
     #   pydantic-core
+    #   sciline
     #   typing-inspection
 typing-inspection==0.4.0
     # via pydantic

{essreduce-25.4.0 → essreduce-25.4.1}/src/ess/reduce/nexus/types.py

@@ -198,19 +198,15 @@ NeXusDetectorName = NeXusName[snx.NXdetector]
 """Name of a detector (bank) in a NeXus file."""
 
 
-class NeXusComponent(
-    sciline.ScopeTwoParams[Component, RunType, sc.DataGroup], sc.DataGroup
-):
+class NeXusComponent(sciline.Scope[Component, RunType, sc.DataGroup], sc.DataGroup):
     """Raw data from a NeXus component."""
 
 
-class AllNeXusComponents(
-    sciline.ScopeTwoParams[Component, RunType, sc.DataGroup], sc.DataGroup
-):
+class AllNeXusComponents(sciline.Scope[Component, RunType, sc.DataGroup], sc.DataGroup):
     """Raw data from all NeXus components of one class."""
 
 
-class NeXusData(sciline.ScopeTwoParams[Component, RunType, sc.DataArray], sc.DataArray):
+class NeXusData(sciline.Scope[Component, RunType, sc.DataArray], sc.DataArray):
     """
     Data array loaded from an NXevent_data or NXdata group.
 
@@ -218,7 +214,7 @@ class NeXusData(sciline.ScopeTwoParams[Component, RunType, sc.DataArray], sc.Dat
     """
 
 
-class Position(sciline.ScopeTwoParams[Component, RunType, sc.Variable], sc.Variable):
+class Position(sciline.Scope[Component, RunType, sc.Variable], sc.Variable):
     """Position of a component such as source, sample, monitor, or detector."""
 
 
@@ -227,7 +223,7 @@ class DetectorPositionOffset(sciline.Scope[RunType, sc.Variable], sc.Variable):
 
 
 class MonitorPositionOffset(
-    sciline.ScopeTwoParams[RunType, MonitorType, sc.Variable], sc.Variable
+    sciline.Scope[RunType, MonitorType, sc.Variable], sc.Variable
 ):
     """Offset for the monitor position, added to base position."""
 
@@ -241,7 +237,7 @@ class CalibratedBeamline(sciline.Scope[RunType, sc.DataArray], sc.DataArray):
 
 
 class CalibratedMonitor(
-    sciline.ScopeTwoParams[RunType, MonitorType, sc.DataArray], sc.DataArray
+    sciline.Scope[RunType, MonitorType, sc.DataArray], sc.DataArray
 ):
     """Calibrated data from a monitor."""
 
@@ -250,9 +246,7 @@ class DetectorData(sciline.Scope[RunType, sc.DataArray], sc.DataArray):
     """Calibrated detector merged with neutron event or histogram data."""
 
 
-class MonitorData(
-    sciline.ScopeTwoParams[RunType, MonitorType, sc.DataArray], sc.DataArray
-):
+class MonitorData(sciline.Scope[RunType, MonitorType, sc.DataArray], sc.DataArray):
     """Calibrated monitor merged with neutron event or histogram data."""
 
 
@@ -314,7 +308,7 @@ class NeXusDataLocationSpec(NeXusLocationSpec, Generic[Component, RunType]):
 
 
 class NeXusTransformationChain(
-    sciline.ScopeTwoParams[Component, RunType, snx.TransformationChain],
+    sciline.Scope[Component, RunType, snx.TransformationChain],
     snx.TransformationChain,
 ): ...
 

{essreduce-25.4.0 → essreduce-25.4.1}/src/ess/reduce/time_of_flight/interpolator_numba.py

@@ -43,13 +43,16 @@ def interpolate(
     if not (len(xp) == len(yp) == len(zp) == len(out)):
         raise ValueError("Interpolator: all input arrays must have the same size.")
 
+    nx = len(x)
+    ny = len(y)
+    nz = len(z)
     npoints = len(xp)
     xmin = x[0]
-    xmax = x[-1]
+    xmax = x[nx - 1]
     ymin = y[0]
-    ymax = y[-1]
+    ymax = y[ny - 1]
     zmin = z[0]
-    zmax = z[-1]
+    zmax = z[nz - 1]
     dx = x[1] - xmin
     dy = y[1] - ymin
     dz = z[1] - zmin
@@ -75,14 +78,14 @@ def interpolate(
             out[i] = fill_value
 
         else:
-            ix = int((xx - xmin) * one_over_dx)
-            iy = int((yy - ymin) * one_over_dy)
-            iz = int((zz - zmin) * one_over_dz)
+            ix = nx - 2 if xx == xmax else int((xx - xmin) * one_over_dx)
+            iy = ny - 2 if yy == ymax else int((yy - ymin) * one_over_dy)
+            iz = nz - 2 if zz == zmax else int((zz - zmin) * one_over_dz)
 
-            y2 = y[iy + 1]
-            y1 = y[iy]
-            x2 = x[ix + 1]
             x1 = x[ix]
+            x2 = x[ix + 1]
+            y1 = y[iy]
+            y2 = y[iy + 1]
             z1 = z[iz]
             z2 = z[iz + 1]
 

{essreduce-25.4.0 → essreduce-25.4.1/src/essreduce.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: essreduce
-Version: 25.4.0
+Version: 25.4.1
 Summary: Common data reduction tools for the ESS facility
 Author: Scipp contributors
 License: BSD 3-Clause License
@@ -51,7 +51,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: sciline>=24.06.2
+Requires-Dist: sciline>=25.04.1
 Requires-Dist: scipp>=25.01.0
 Requires-Dist: scippneutron>=25.02.0
 Requires-Dist: scippnexus>=24.11.0

{essreduce-25.4.0 → essreduce-25.4.1}/src/essreduce.egg-info/requires.txt

@@ -1,4 +1,4 @@
-sciline>=24.06.2
+sciline>=25.04.1
 scipp>=25.01.0
 scippneutron>=25.02.0
 scippnexus>=24.11.0

{essreduce-25.4.0 → essreduce-25.4.1}/tests/time_of_flight/interpolator_test.py

@@ -74,3 +74,24 @@ def test_numba_and_scipy_interpolators_yield_same_results_with_out_of_bounds():
     scipy_result = scipy_interp(times, distances, pulse_indices)
 
     assert np.allclose(numba_result, scipy_result, equal_nan=True)
+
+
+def test_numba_and_scipy_interpolators_yield_same_results_with_values_on_edges():
+    numba_interp, scipy_interp = _make_interpolators()
+
+    rng = np.random.default_rng(seed=42)
+    npoints = 2
+
+    times = np.array([0.0, 71.0])
+    distances = rng.uniform(39, 71, npoints)
+    pulse_indices = rng.uniform(-1, 2, npoints)
+    numba_result = numba_interp(times, distances, pulse_indices)
+    scipy_result = scipy_interp(times, distances, pulse_indices)
+    assert np.allclose(numba_result, scipy_result, equal_nan=True)
+
+    times = rng.uniform(0, 71, npoints)
+    distances = np.array([40.0, 70.0])
+    pulse_indices = rng.uniform(-1, 2, npoints)
+    numba_result = numba_interp(times, distances, pulse_indices)
+    scipy_result = scipy_interp(times, distances, pulse_indices)
+    assert np.allclose(numba_result, scipy_result, equal_nan=True)