Merge pull request #151 from scipp/use-ess-reduce-uncertainty

Use ess.reduce.uncertainty

pyproject.toml

@@ -32,7 +32,7 @@ requires-python = ">=3.10"
 dependencies = [
   "dask",
   "graphviz",
-  "essreduce",
+  "essreduce>=24.07.1",
   "numpy",
   "pandas",
   "plopp",

requirements/base.in

@@ -4,7 +4,7 @@
 # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
 dask
 graphviz
-essreduce
+essreduce>=24.07.1
 numpy
 pandas
 plopp

requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:a419141758f6ec7372e221342a4009155e24e0b3
+# SHA1:de9b98c06b7f66e8a4b7ad3c33a255c987e96668
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -7,7 +7,7 @@
 #
 asttokens==2.4.1
     # via stack-data
-certifi==2024.6.2
+certifi==2024.7.4
     # via requests
 charset-normalizer==3.3.2
     # via requests
@@ -23,19 +23,19 @@ cyclebane==24.6.0
     # via sciline
 cycler==0.12.1
     # via matplotlib
-dask==2024.6.2
+dask==2024.7.0
     # via -r base.in
 decorator==5.1.1
     # via ipython
-essreduce==24.6.0
+essreduce==24.7.1
     # via -r base.in
 exceptiongroup==1.2.1
     # via ipython
 executing==2.0.1
     # via stack-data
-fonttools==4.53.0
+fonttools==4.53.1
     # via matplotlib
-fsspec==2024.6.0
+fsspec==2024.6.1
     # via dask
 graphviz==0.20.3
     # via -r base.in
@@ -49,7 +49,7 @@ importlib-metadata==8.0.0
     # via dask
 ipydatawidgets==4.3.5
     # via pythreejs
-ipython==8.25.0
+ipython==8.26.0
     # via ipywidgets
 ipywidgets==8.1.3
     # via
@@ -63,7 +63,7 @@ kiwisolver==1.4.5
     # via matplotlib
 locket==1.0.0
     # via partd
-matplotlib==3.9.0
+matplotlib==3.9.1
     # via
     #   mpltoolbox
     #   plopp
@@ -99,7 +99,7 @@ partd==1.4.2
     # via dask
 pexpect==4.9.0
     # via ipython
-pillow==10.3.0
+pillow==10.4.0
     # via matplotlib
 platformdirs==4.2.2
     # via pooch
@@ -140,7 +140,7 @@ scipp==24.6.0
     #   essreduce
     #   scippneutron
     #   scippnexus
-scippneutron==24.6.0
+scippneutron==24.7.0
     # via -r base.in
 scippnexus==24.6.0
     # via

requirements/ci.txt

@@ -7,7 +7,7 @@
 #
 cachetools==5.3.3
     # via tox
-certifi==2024.6.2
+certifi==2024.7.4
     # via requests
 chardet==5.2.0
     # via tox
@@ -48,7 +48,7 @@ tomli==2.0.1
     # via
     #   pyproject-api
     #   tox
-tox==4.15.1
+tox==4.16.0
     # via -r ci.in
 urllib3==2.2.2
     # via requests

requirements/dev.txt

@@ -28,9 +28,9 @@ async-lru==2.0.4
     # via jupyterlab
 cffi==1.16.0
     # via argon2-cffi-bindings
-copier==9.2.0
+copier==9.3.1
     # via -r dev.in
-dunamai==1.21.1
+dunamai==1.21.2
     # via copier
 fqdn==1.5.1
     # via jsonschema
@@ -50,7 +50,7 @@ json5==0.9.25
     # via jupyterlab-server
 jsonpointer==3.0.0
     # via jsonschema
-jsonschema[format-nongpl]==4.22.0
+jsonschema[format-nongpl]==4.23.0
     # via
     #   jupyter-events
     #   jupyterlab-server
@@ -67,7 +67,7 @@ jupyter-server==2.14.1
     #   notebook-shim
 jupyter-server-terminals==0.5.3
     # via jupyter-server
-jupyterlab==4.2.2
+jupyterlab==4.2.3
     # via -r dev.in
 jupyterlab-server==2.27.2
     # via jupyterlab
@@ -87,9 +87,9 @@ prometheus-client==0.20.0
     # via jupyter-server
 pycparser==2.22
     # via cffi
-pydantic==2.7.4
+pydantic==2.8.2
     # via copier
-pydantic-core==2.18.4
+pydantic-core==2.20.1
     # via pydantic
 python-json-logger==2.0.7
     # via jupyter-events

requirements/docs.txt

@@ -38,15 +38,15 @@ fastjsonschema==2.20.0
     # via nbformat
 imagesize==1.4.1
     # via sphinx
-ipykernel==6.29.4
+ipykernel==6.29.5
     # via -r docs.in
 jinja2==3.1.4
     # via
     #   myst-parser
     #   nbconvert
     #   nbsphinx
     #   sphinx
-jsonschema==4.22.0
+jsonschema==4.23.0
     # via nbformat
 jsonschema-specifications==2023.12.1
     # via jsonschema
@@ -106,7 +106,7 @@ referencing==0.35.1
     # via
     #   jsonschema
     #   jsonschema-specifications
-rpds-py==0.18.1
+rpds-py==0.19.0
     # via
     #   jsonschema
     #   referencing

requirements/nightly.in

@@ -3,7 +3,7 @@
 # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
 dask
 graphviz
-essreduce
+essreduce>=24.07.1
 numpy
 pandas
 pythreejs

requirements/nightly.txt

@@ -1,4 +1,4 @@
-# SHA1:5bcc8aaff2015158a2013bfbad166d4226952cc9
+# SHA1:942b2a0d63bab480e4dfe7e345ab2839de386dd8
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -8,7 +8,7 @@
 -r basetest.txt
 asttokens==2.4.1
     # via stack-data
-certifi==2024.6.2
+certifi==2024.7.4
     # via requests
 charset-normalizer==3.3.2
     # via requests
@@ -24,17 +24,17 @@ cyclebane==24.6.0
     # via sciline
 cycler==0.12.1
     # via matplotlib
-dask==2024.6.2
+dask==2024.7.0
     # via -r nightly.in
 decorator==5.1.1
     # via ipython
-essreduce==24.6.0
+essreduce==24.7.1
     # via -r nightly.in
 executing==2.0.1
     # via stack-data
-fonttools==4.53.0
+fonttools==4.53.1
     # via matplotlib
-fsspec==2024.6.0
+fsspec==2024.6.1
     # via dask
 graphviz==0.20.3
     # via -r nightly.in
@@ -48,7 +48,7 @@ importlib-metadata==8.0.0
     # via dask
 ipydatawidgets==4.3.5
     # via pythreejs
-ipython==8.25.0
+ipython==8.26.0
     # via ipywidgets
 ipywidgets==8.1.3
     # via
@@ -62,7 +62,7 @@ kiwisolver==1.4.5
     # via matplotlib
 locket==1.0.0
     # via partd
-matplotlib==3.9.0
+matplotlib==3.9.1
     # via
     #   mpltoolbox
     #   plopp
@@ -93,7 +93,7 @@ partd==1.4.2
     # via dask
 pexpect==4.9.0
     # via ipython
-pillow==10.3.0
+pillow==10.4.0
     # via matplotlib
 platformdirs==4.2.2
     # via pooch

requirements/static.txt

@@ -11,7 +11,7 @@ distlib==0.3.8
     # via virtualenv
 filelock==3.15.4
     # via virtualenv
-identify==2.5.36
+identify==2.6.0
     # via pre-commit
 nodeenv==1.9.1
     # via pre-commit

src/ess/sans/beam_center_finder.py

@@ -7,6 +7,7 @@
 import numpy as np
 import sciline
 import scipp as sc
+from ess.reduce.uncertainty import UncertaintyBroadcastMode
 from scipp.core import concepts
 
 from .conversions import (
@@ -36,7 +37,6 @@
     QBins,
     ReturnEvents,
     SampleRun,
-    UncertaintyBroadcastMode,
     WavelengthBands,
     WavelengthBins,
     WavelengthMask,

src/ess/sans/i_of_q.py

@@ -3,6 +3,7 @@
 import uuid
 
 import scipp as sc
+from ess.reduce.uncertainty import UncertaintyBroadcastMode, broadcast_uncertainties
 from scipp.scipy.interpolate import interp1d
 
 from .common import mask_range
@@ -31,11 +32,9 @@
     RunType,
     SampleRun,
     ScatteringRunType,
-    UncertaintyBroadcastMode,
     WavelengthBins,
     WavelengthMonitor,
 )
-from .uncertainty import broadcast_with_upper_bound_variances
 
 
 def preprocess_monitor_data(
@@ -65,7 +64,7 @@ def preprocess_monitor_data(
         background. Everything outside this range is treated as background counts.
     uncertainties:
         The mode for broadcasting uncertainties. See
-        :py:class:`UncertaintyBroadcastMode` for details.
+        :py:class:`ess.reduce.uncertainty.UncertaintyBroadcastMode` for details.
 
     Returns
     -------
@@ -87,14 +86,9 @@ def preprocess_monitor_data(
         monitor = monitor.rebin(wavelength=wavelength_bins)
 
     if background is not None:
-        if uncertainties == UncertaintyBroadcastMode.drop:
-            monitor -= sc.values(background)
-        elif uncertainties == UncertaintyBroadcastMode.upper_bound:
-            monitor -= broadcast_with_upper_bound_variances(
-                background, sizes=monitor.sizes
-            )
-        else:
-            monitor -= background
+        monitor -= broadcast_uncertainties(
+            background, prototype=monitor, mode=uncertainties
+        )
     return CleanMonitor(monitor)