essreduce 25.2.0__tar.gz → 25.2.2__tar.gz

{essreduce-25.2.0 → essreduce-25.2.2}/.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: aa5dc5e
+_commit: 5c4fd02
 _src_path: gh:scipp/copier_template
 description: Common data reduction tools for the ESS facility
 max_python: '3.13'

{essreduce-25.2.0 → essreduce-25.2.2}/.github/workflows/docs.yml

@@ -69,7 +69,7 @@ jobs:
           name: docs_html
           path: html/
 
-      - uses: JamesIves/github-pages-deploy-action@v4.6.9
+      - uses: JamesIves/github-pages-deploy-action@v4.7.2
         if: ${{ inputs.publish }}
         with:
           branch: gh-pages

essreduce-25.2.2/.github/workflows/weekly_windows_macos.yml

@@ -0,0 +1,42 @@
+name: Windows and MacOS weekly tests
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 2 * * 1'
+
+jobs:
+  pytox:
+    name: Python and Tox env
+    runs-on: 'ubuntu-24.04'
+    outputs:
+      min_python: ${{ steps.vars.outputs.min_python }}
+      min_tox_env: ${{ steps.vars.outputs.min_tox_env }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get Python version for other CI jobs
+        id: vars
+        run: |
+          echo "min_python=$(cat .github/workflows/python-version-ci)" >> $GITHUB_OUTPUT
+          echo "min_tox_env=py$(cat .github/workflows/python-version-ci | sed 's/\.//g')" >> $GITHUB_OUTPUT
+  tests:
+    name: Tests
+    needs: pytox
+    strategy:
+      matrix:
+        os: ['macos-latest', 'windows-latest']
+        python:
+          - version: '${{needs.pytox.outputs.min_python}}'
+            tox-env: '${{needs.pytox.outputs.min_tox_env}}'
+    uses: ./.github/workflows/test.yml
+    with:
+      os-variant: ${{ matrix.os }}
+      python-version: ${{ matrix.python.version }}
+      tox-env: ${{ matrix.python.tox-env }}
+
+  docs:
+    needs: tests
+    uses: ./.github/workflows/docs.yml
+    with:
+      publish: false
+      branch: ${{ github.head_ref == '' && github.ref_name || github.head_ref }}

{essreduce-25.2.0 → essreduce-25.2.2}/.gitignore

@@ -4,7 +4,8 @@ dist
 html
 .tox
 *.egg-info
-uv.lock  # we lock dependencies with pip-compile, not uv
+# we lock dependencies with pip-compile, not uv
+uv.lock
 
 *.sw?
 

{essreduce-25.2.0 → essreduce-25.2.2}/.pre-commit-config.yaml

@@ -23,7 +23,7 @@ repos:
         args: [ "--drop-empty-cells",
                 "--extra-keys 'metadata.language_info.version cell.metadata.jp-MarkdownHeadingCollapsed cell.metadata.pycharm'" ]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.9
+    rev: v0.8.0
     hooks:
       - id: ruff
         args: [ --fix ]

{essreduce-25.2.0/src/essreduce.egg-info → essreduce-25.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: essreduce
-Version: 25.2.0
+Version: 25.2.2
 Summary: Common data reduction tools for the ESS facility
 Author: Scipp contributors
 License: BSD 3-Clause License

{essreduce-25.2.0 → essreduce-25.2.2}/pyproject.toml

@@ -88,13 +88,12 @@ ignore = [
     # https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
     "COM812", "COM819", "D206", "D300", "E111", "E114", "E117", "ISC001", "ISC002", "Q000", "Q001", "Q002", "Q003", "W191",
 ]
-fixable = ["B010", "I001", "PT001"]
+fixable = ["B010", "I001", "PT001", "RUF022"]
 isort.known-first-party = ["ess.reduce"]
 pydocstyle.convention = "numpy"
 
 [tool.ruff.lint.per-file-ignores]
 # those files have an increased risk of relying on import order
-"__init__.py" = ["I"]
 "tests/*" = [
     "S101",  # asserts are fine in tests
     "B018",  # 'useless expressions' are ok because some tests just check for exceptions

{essreduce-25.2.0 → essreduce-25.2.2}/requirements/ci.txt

@@ -54,5 +54,5 @@ typing-extensions==4.12.2
     # via tox
 urllib3==2.3.0
     # via requests
-virtualenv==20.29.1
+virtualenv==20.29.2
     # via tox

{essreduce-25.2.0 → essreduce-25.2.2}/requirements/docs.txt

@@ -10,6 +10,8 @@ accessible-pygments==0.0.5
     # via pydata-sphinx-theme
 alabaster==1.0.0
     # via sphinx
+appnope==0.1.4
+    # via ipykernel
 asttokens==3.0.0
     # via stack-data
 attrs==25.1.0
@@ -114,7 +116,7 @@ mdurl==0.1.2
     # via markdown-it-py
 mistune==3.1.1
     # via nbconvert
-myst-parser==4.0.0
+myst-parser==4.0.1
     # via -r docs.in
 nbclient==0.10.2
     # via nbconvert

{essreduce-25.2.0 → essreduce-25.2.2}/requirements/make_base.py

@@ -1,4 +1,3 @@
-import sys
 from argparse import ArgumentParser
 from pathlib import Path
 
@@ -58,11 +57,15 @@ def as_nightly(repo: str) -> str:
     else:
         org = "scipp"
     if repo == "scipp":
-        version = f"cp{sys.version_info.major}{sys.version_info.minor}"
-        base = "https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly"
-        suffix = "manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
-        prefix = "scipp @ "
-        return prefix + "-".join([base, version, version, suffix])
+        # With the standard pip resolver index-url takes precedence over
+        # extra-index-url but with uv it's reversed, so if we move to tox-uv
+        # this needs to be reversed.
+        return (
+            "scipp\n"
+            "--index-url=https://pypi.anaconda.org/scipp-nightly-wheels/simple/\n"
+            "--extra-index-url=https://pypi.org/simple\n"
+            "--pre"
+        )
     return f"{repo} @ git+https://github.com/{org}/{repo}@main"
 
 

{essreduce-25.2.0 → essreduce-25.2.2}/requirements/nightly.in

@@ -6,7 +6,10 @@ pooch
 pytest
 scipy>=1.7.0
 scippnexus @ git+https://github.com/scipp/scippnexus@main
-scipp @ https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+scipp
+--index-url=https://pypi.anaconda.org/scipp-nightly-wheels/simple/
+--extra-index-url=https://pypi.org/simple
+--pre
 sciline @ git+https://github.com/scipp/sciline@main
 cyclebane @ git+https://github.com/scipp/cyclebane@main
 scippneutron @ git+https://github.com/scipp/scippneutron@main

{essreduce-25.2.0 → essreduce-25.2.2}/requirements/nightly.txt

@@ -1,10 +1,13 @@
-# SHA1:c690c87be2259750742e8cf48f070ab7101b1da9
+# SHA1:804c57e3756542ebfed032534ab086369b4c9b6c
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
 #
 #    pip-compile-multi
 #
+--index-url https://pypi.anaconda.org/scipp-nightly-wheels/simple/
+--extra-index-url https://pypi.org/simple
+
 annotated-types==0.7.0
     # via pydantic
 asttokens==3.0.0
@@ -108,9 +111,9 @@ ptyprocess==0.7.0
     # via pexpect
 pure-eval==0.2.3
     # via stack-data
-pydantic==2.10.6
+pydantic==2.11.0a2
     # via scippneutron
-pydantic-core==2.27.2
+pydantic-core==2.29.0
     # via pydantic
 pygments==2.19.1
     # via ipython
@@ -127,7 +130,7 @@ requests==2.32.3
     # via pooch
 sciline @ git+https://github.com/scipp/sciline@main
     # via -r nightly.in
-scipp @ https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+scipp==100.0.0.dev0
     # via
     #   -r nightly.in
     #   scippneutron

{essreduce-25.2.0 → essreduce-25.2.2}/requirements/static.txt

@@ -11,7 +11,7 @@ distlib==0.3.9
     # via virtualenv
 filelock==3.17.0
     # via virtualenv
-identify==2.6.6
+identify==2.6.7
     # via pre-commit
 nodeenv==1.9.1
     # via pre-commit
@@ -21,5 +21,5 @@ pre-commit==4.1.0
     # via -r static.in
 pyyaml==6.0.2
     # via pre-commit
-virtualenv==20.29.1
+virtualenv==20.29.2
     # via pre-commit

{essreduce-25.2.0 → essreduce-25.2.2}/src/ess/reduce/__init__.py

@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) 2024 Scipp contributors (https://github.com/scipp)
-# ruff: noqa: E402, F401
+# Copyright (c) 2025 Scipp contributors (https://github.com/scipp)
+# ruff: noqa: E402, F401, I
 
 import importlib.metadata
 
-from . import nexus, uncertainty, time_of_flight
+from . import nexus, time_of_flight, uncertainty
 
 try:
     __version__ = importlib.metadata.version("essreduce")
@@ -13,4 +13,4 @@ except importlib.metadata.PackageNotFoundError:
 
 del importlib
 
-__all__ = ["nexus", "uncertainty", "time_of_flight"]
+__all__ = ["nexus", "time_of_flight", "uncertainty"]

{essreduce-25.2.0 → essreduce-25.2.2}/src/ess/reduce/live/raw.py

@@ -255,10 +255,19 @@ class RollingDetectorView(Detector):
         self._projection = projection
         self._window = window
         self._current = 0
-        self._history: sc.DataArray | None = None
-        self._cache: sc.DataArray | None = None
+        self._history: sc.DataArray
+        self._cache: sc.DataArray
+        self._cumulative: sc.DataArray
         self.clear_counts()
 
+    @property
+    def max_window(self) -> int:
+        return self._window
+
+    @property
+    def cumulative(self) -> sc.DataArray:
+        return self._cumulative
+
     def clear_counts(self) -> None:
         """
         Clear counts.
@@ -275,6 +284,7 @@ class RollingDetectorView(Detector):
             .copy()
         )
         self._cache = self._history.sum('window')
+        self._cumulative = sc.zeros_like(self._cache)
 
     def make_roi_filter(self) -> roi.ROIFilter:
         """Return a ROI filter operating via the projection plane of the view."""
@@ -494,6 +504,7 @@ class RollingDetectorView(Detector):
         self._cache -= self._history['window', self._current]
         self._history['window', self._current] = counts
         self._cache += counts
+        self._cumulative += counts
         self._current = (self._current + 1) % self._window
 
 

{essreduce-25.2.0 → essreduce-25.2.2}/src/ess/reduce/live/roi.py

@@ -32,6 +32,7 @@ def select_indices_in_intervals(
     for dim, bounds in intervals.items():
         low, high = sorted(bounds)
         indices = indices[dim, low:high]
+    indices = indices if isinstance(indices, sc.Variable) else indices.data
     indices = indices.flatten(to=out_dim)
     if indices.bins is None:
         return indices

{essreduce-25.2.0 → essreduce-25.2.2}/src/ess/reduce/time_of_flight/__init__.py

@@ -7,8 +7,8 @@ neutron time-of-arrival at the detectors.
 """
 
 from .simulation import simulate_beamline
-from .toa_to_tof import default_parameters, resample_tof_data, providers
 from .to_events import to_events
+from .toa_to_tof import default_parameters, providers, resample_tof_data
 from .types import (
     DistanceResolution,
     LookupTableRelativeErrorThreshold,
@@ -25,7 +25,6 @@ from .types import (
     TofData,
 )
 
-
 __all__ = [
     "DistanceResolution",
     "LookupTableRelativeErrorThreshold",

{essreduce-25.2.0 → essreduce-25.2.2}/src/ess/reduce/widgets/__init__.py

@@ -7,29 +7,28 @@ from typing import Any, Protocol
 import ipywidgets as widgets
 
 from ..parameter import (
+    BinEdgesParameter,
     BooleanParameter,
     FilenameParameter,
     MultiFilenameParameter,
     MultiStringParameter,
-    ParamWithOptions,
-    StringParameter,
     Parameter,
     ParamWithBounds,
-    BinEdgesParameter,
+    ParamWithOptions,
+    StringParameter,
     Vector2dParameter,
     Vector3dParameter,
 )
-from ._config import default_layout, default_style
-
 from ._binedges_widget import BinEdgesWidget
+from ._bounds_widget import BoundsWidget
+from ._config import default_layout, default_style
 from ._filename_widget import FilenameWidget, MultiFilenameWidget
 from ._linspace_widget import LinspaceWidget
-from ._vector_widget import VectorWidget
-from ._bounds_widget import BoundsWidget
-from ._string_widget import MultiStringWidget, StringWidget
-from ._switchable_widget import SwitchWidget
 from ._optional_widget import OptionalWidget
 from ._spinner import Spinner
+from ._string_widget import MultiStringWidget, StringWidget
+from ._switchable_widget import SwitchWidget
+from ._vector_widget import VectorWidget
 
 
 class EssWidget(Protocol):
@@ -189,8 +188,8 @@ __all__ = [
     'LinspaceWidget',
     'MultiFilenameWidget',
     'OptionalWidget',
+    'Spinner',
     'SwitchWidget',
     'VectorWidget',
     'create_parameter_widget',
-    'Spinner',
 ]

{essreduce-25.2.0 → essreduce-25.2.2/src/essreduce.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: essreduce
-Version: 25.2.0
+Version: 25.2.2
 Summary: Common data reduction tools for the ESS facility
 Author: Scipp contributors
 License: BSD 3-Clause License

{essreduce-25.2.0 → essreduce-25.2.2}/src/essreduce.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ tox.ini
 .github/workflows/release.yml
 .github/workflows/test.yml
 .github/workflows/unpinned.yml
+.github/workflows/weekly_windows_macos.yml
 conda/meta.yaml
 docs/conf.py
 docs/index.md

{essreduce-25.2.0 → essreduce-25.2.2}/tests/live/raw_test.py

@@ -53,6 +53,15 @@ def test_Detector_bincount_raises_if_detector_number_not_consecutive() -> None:
         det.bincount([1])
 
 
+@pytest.mark.parametrize('window', [1, 2, 33])
+def test_RollingDetectorView_max_window_property_returns_configured(
+    window: int,
+) -> None:
+    detector_number = sc.array(dims=['pixel'], values=[1, 2, 3], unit=None)
+    det = raw.RollingDetectorView(detector_number=detector_number, window=window)
+    assert det.max_window == window
+
+
 def test_RollingDetectorView_full_window() -> None:
     detector_number = sc.array(dims=['pixel'], values=[1, 2, 3], unit=None)
     det = raw.RollingDetectorView(detector_number=detector_number, window=2)
@@ -69,6 +78,38 @@ def test_RollingDetectorView_full_window() -> None:
     assert det.get().sum().value == 2
 
 
+def test_RollingDetectorView_cumulative_returns_everything_since_clear() -> None:
+    detector_number = sc.array(dims=['pixel'], values=[1, 2, 3], unit=None)
+    det = raw.RollingDetectorView(detector_number=detector_number, window=2)
+    expected = sc.zeros_like(det.get())
+    assert sc.identical(det.cumulative, expected)
+    det.add_counts([1, 2, 3, 2])
+    delta1 = det.get(window=1)
+    expected += delta1
+    assert sc.identical(det.cumulative, expected)
+    det.add_counts([1, 3, 2])
+    delta2 = det.get(window=1)
+    expected += delta2
+    assert sc.identical(det.cumulative, expected)
+    assert sc.identical(det.cumulative, det.get())  # everything still in window
+    det.add_counts([1, 2])
+    delta3 = det.get(window=1)
+    expected += delta3
+    assert sc.identical(det.cumulative, expected)
+    assert not sc.identical(det.cumulative, det.get())  # delta1 fell out of window
+    det.add_counts([])
+    assert sc.identical(det.cumulative, expected)
+    # Reset
+    det.clear_counts()
+    expected = sc.zeros_like(expected)
+    assert sc.identical(det.cumulative, expected)
+    assert sc.identical(det.cumulative, expected)
+    det.add_counts([1, 2, 3, 2])
+    delta1 = det.get(window=1)
+    expected += delta1
+    assert sc.identical(det.cumulative, expected)
+
+
 def test_RollingDetectorView_add_events_accepts_unsorted_detector_number() -> None:
     detector_number = sc.array(dims=['detector_number'], values=[1, 3, 2], unit=None)
     det = raw.RollingDetectorView(detector_number=detector_number, window=2)

{essreduce-25.2.0 → essreduce-25.2.2}/tests/live/roi_test.py

@@ -64,6 +64,14 @@ def test_select_indices_fails_without_required_coords():
         )
 
 
+def test_select_indices_works_with_empty_selection(binned_indices):
+    selected = roi.select_indices_in_intervals(
+        intervals=sc.DataGroup(x=(1, 1)), indices=binned_indices
+    )
+    assert selected.dim == 'index'
+    assert selected.sizes[selected.dim] == 0
+
+
 def test_apply_selection_empty_yields_empty_result():
     selection = sc.array(dims=['index'], values=[], unit=None, dtype='int32')
     data = sc.arange('detector_number', 12, dtype='int32')

{essreduce-25.2.0 → essreduce-25.2.2}/tox.ini

@@ -10,6 +10,9 @@ commands = pytest {posargs}
 
 [testenv:nightly]
 deps = -r requirements/nightly.txt
+setenv =
+  PIP_INDEX_URL = https://pypi.anaconda.org/scipp-nightly-wheels/simple
+  PIP_EXTRA_INDEX_URL = https://pypi.org/simple
 commands = pytest {posargs}
 
 [testenv:unpinned]
@@ -64,4 +67,4 @@ deps =
 skip_install = true
 changedir = requirements
 commands = python ./make_base.py --nightly scippnexus,scipp,sciline,cyclebane,scippneutron,tof
-           pip-compile-multi -d . --backtracking
+           pip-compile-multi -d . --backtracking --annotate-index

{essreduce-25.2.0 → essreduce-25.2.2}/src/ess/reduce/nexus/__init__.py

@@ -13,23 +13,23 @@ The submodule :mod:`types` defines all domain types.
 """
 
 from . import types
-from .workflow import GenericNeXusWorkflow
 from ._nexus_loader import (
-    load_data,
-    group_event_data,
-    load_component,
-    load_all_components,
     compute_component_position,
     extract_signal_data_array,
+    group_event_data,
+    load_all_components,
+    load_component,
+    load_data,
 )
+from .workflow import GenericNeXusWorkflow
 
 __all__ = [
-    'types',
+    'GenericNeXusWorkflow',
+    'compute_component_position',
+    'extract_signal_data_array',
     'group_event_data',
     'load_all_components',
-    'load_data',
     'load_component',
-    'compute_component_position',
-    'extract_signal_data_array',
-    'GenericNeXusWorkflow',
+    'load_data',
+    'types',
 ]