diff --git a/pyproject.toml b/pyproject.toml index d8805a4b..4fe63c6a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ requires-python = ">=3.11" # Make sure to list one dependency per line. dependencies = [ "dask>=2022.1.0", - "essreduce>=26.2.1", + "essreduce>=26.3.1", "graphviz", "numpy>=2", "plopp>=26.2.0", diff --git a/requirements/base.in b/requirements/base.in index e6b4f5f0..84fc939a 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -3,7 +3,7 @@ # --- END OF CUSTOM SECTION --- # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY! dask>=2022.1.0 -essreduce>=26.2.1 +essreduce>=26.3.1 graphviz numpy>=2 plopp>=26.2.0 @@ -12,6 +12,6 @@ sciline>=25.04.1 scipp>=25.11.0 scippneutron>=25.02.0 scippnexus>=23.12.0 -tof>=25.11.1 +tof>=25.12.0 ncrystal[cif]>=4.1.0 spglib!=2.7 diff --git a/requirements/base.txt b/requirements/base.txt index 37d1b9d8..21873ecb 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,4 +1,4 @@ -# SHA1:e8dc8a7c4338f6f02931f7cf0dd2408d0d0351db +# SHA1:13277aa03c7beef37838e768fb3e12ce43df7827 # # This file was generated by pip-compile-multi. # To update, run: @@ -11,9 +11,9 @@ ase==3.27.0 # via ncrystal asttokens==3.0.1 # via stack-data -certifi==2026.1.4 +certifi==2026.2.25 # via requests -charset-normalizer==3.4.4 +charset-normalizer==3.4.5 # via requests click==8.3.1 # via dask @@ -35,7 +35,7 @@ dnspython==2.8.0 # via email-validator email-validator==2.3.0 # via scippneutron -essreduce==26.2.1 +essreduce==26.3.1 # via -r base.in executing==2.2.1 # via stack-data @@ -43,11 +43,11 @@ fonttools==4.61.1 # via matplotlib fsspec==2026.2.0 # via dask -gemmi==0.7.4 +gemmi==0.7.5 # via ncrystal graphviz==0.21 # via -r base.in -h5py==3.15.1 +h5py==3.16.0 # via # scippneutron # scippnexus @@ -71,9 +71,9 @@ jedi==0.19.2 # via ipython jupyterlab-widgets==3.0.16 # via ipywidgets -kiwisolver==1.4.9 +kiwisolver==1.5.0 # via matplotlib -lazy-loader==0.4 +lazy-loader==0.5 # via # plopp # scippneutron @@ -87,7 +87,7 @@ matplotlib==3.10.8 # plopp matplotlib-inline==0.2.1 # via ipython -mpltoolbox==25.10.0 +mpltoolbox==26.2.0 # via scippneutron ncrystal[cif]==4.2.12 # via -r base.in @@ -97,7 +97,7 @@ ncrystal-python==4.2.12 # via ncrystal networkx==3.6.1 # via cyclebane -numpy==2.4.2 +numpy==2.4.3 # via # -r base.in # ase @@ -125,9 +125,9 @@ pexpect==4.9.0 # via ipython pillow==12.1.1 # via matplotlib -platformdirs==4.5.1 +platformdirs==4.9.4 # via pooch -plopp==26.2.0 +plopp==26.3.0 # via # -r base.in # scippneutron @@ -164,14 +164,14 @@ sciline==25.11.1 # via # -r base.in # essreduce -scipp==26.2.0 +scipp==26.3.0 # via # -r base.in # essreduce # scippneutron # scippnexus # tof -scippneutron==25.11.2 +scippneutron==26.2.0 # via # -r base.in # essreduce @@ -180,7 +180,7 @@ scippnexus==26.1.1 # -r base.in # essreduce # scippneutron -scipy==1.17.0 +scipy==1.17.1 # via # ase # scippneutron diff --git a/requirements/basetest.txt b/requirements/basetest.txt index 32695a75..4b147bc4 100644 --- a/requirements/basetest.txt +++ b/requirements/basetest.txt @@ -7,9 +7,9 @@ # asttokens==3.0.1 # via stack-data -certifi==2026.1.4 +certifi==2026.2.25 # via requests -charset-normalizer==3.4.4 +charset-normalizer==3.4.5 # via requests comm==0.2.3 # via ipywidgets @@ -33,19 +33,19 @@ jupyterlab-widgets==3.0.16 # via ipywidgets matplotlib-inline==0.2.1 # via ipython -numpy==2.4.2 +numpy==2.4.3 # via pandas packaging==26.0 # via # pooch # pytest -pandas==3.0.0 +pandas==3.0.1 # via -r basetest.in parso==0.8.6 # via jedi pexpect==4.9.0 # via ipython -platformdirs==4.5.1 +platformdirs==4.9.4 # via pooch pluggy==1.6.0 # via pytest diff --git a/requirements/ci.txt b/requirements/ci.txt index fd69cd42..21b87c34 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -5,20 +5,19 @@ # # requirements upgrade # -cachetools==7.0.1 +cachetools==7.0.4 # via tox -certifi==2026.1.4 +certifi==2026.2.25 # via requests -chardet==5.2.0 - # via tox -charset-normalizer==3.4.4 +charset-normalizer==3.4.5 # via requests colorama==0.4.6 # via tox distlib==0.4.0 # via virtualenv -filelock==3.20.3 +filelock==3.25.0 # via + # python-discovery # tox # virtualenv gitdb==4.0.12 @@ -32,21 +31,26 @@ packaging==26.0 # -r ci.in # pyproject-api # tox -platformdirs==4.5.1 +platformdirs==4.9.4 # via + # python-discovery # tox # virtualenv pluggy==1.6.0 # via tox pyproject-api==1.10.0 # via tox +python-discovery==1.1.1 + # via virtualenv requests==2.32.5 # via -r ci.in -smmap==5.0.2 +smmap==5.0.3 # via gitdb -tox==4.34.1 +tomli-w==1.2.0 + # via tox +tox==4.49.0 # via -r ci.in urllib3==2.6.3 # via requests -virtualenv==20.36.1 +virtualenv==21.1.0 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 1b6bda4c..c90cd996 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -22,13 +22,13 @@ argon2-cffi-bindings==25.1.0 # via argon2-cffi arrow==1.4.0 # via isoduration -async-lru==2.1.0 +async-lru==2.2.0 # via jupyterlab cffi==2.0.0 # via argon2-cffi-bindings -copier==9.11.3 +copier==9.13.1 # via -r dev.in -dunamai==1.25.0 +dunamai==1.26.0 # via copier fqdn==1.5.1 # via jsonschema @@ -65,7 +65,7 @@ jupyter-server==2.17.0 # notebook-shim jupyter-server-terminals==0.5.4 # via jupyter-server -jupyterlab==4.5.4 +jupyterlab==4.5.5 # via -r dev.in jupyterlab-server==2.28.0 # via jupyterlab diff --git a/requirements/docs.txt b/requirements/docs.txt index e1456dcc..d7da0669 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -40,7 +40,7 @@ docutils==0.22.4 # sphinxcontrib-bibtex fastjsonschema==2.21.2 # via nbformat -imagesize==1.4.1 +imagesize==2.0.0 # via sphinx ipykernel==7.2.0 # via -r docs.in @@ -100,13 +100,13 @@ nbsphinx==0.9.8 # via -r docs.in nest-asyncio==1.6.0 # via ipykernel -pandas==3.0.0 +pandas==3.0.1 # via -r docs.in pandocfilters==1.5.1 # via nbconvert psutil==7.2.2 # via ipykernel -pyarrow==23.0.0 +pyarrow==23.0.1 # via -r docs.in pybtex==0.25.1 # via @@ -114,11 +114,11 @@ pybtex==0.25.1 # sphinxcontrib-bibtex pybtex-docutils==1.0.3 # via sphinxcontrib-bibtex -pydantic-settings==2.12.0 +pydantic-settings==2.13.1 # via autodoc-pydantic pydata-sphinx-theme==0.16.1 # via -r docs.in -python-dotenv==1.2.1 +python-dotenv==1.2.2 # via pydantic-settings pyzmq==27.1.0 # via diff --git a/requirements/mypy.txt b/requirements/mypy.txt index 0f22723e..f90f757a 100644 --- a/requirements/mypy.txt +++ b/requirements/mypy.txt @@ -6,7 +6,7 @@ # requirements upgrade # -r test.txt -librt==0.7.8 +librt==0.8.1 # via mypy mypy==1.19.1 # via -r mypy.in diff --git a/requirements/nightly.txt b/requirements/nightly.txt index c2a68ede..da032417 100644 --- a/requirements/nightly.txt +++ b/requirements/nightly.txt @@ -14,9 +14,9 @@ ase==3.27.0 # via ncrystal asttokens==3.0.1 # via stack-data -certifi==2026.1.4 +certifi==2026.2.25 # via requests -charset-normalizer==3.4.4 +charset-normalizer==3.4.5 # via requests click==8.3.1 # via dask @@ -46,11 +46,11 @@ fonttools==4.61.1 # via matplotlib fsspec==2026.2.0 # via dask -gemmi==0.7.4 +gemmi==0.7.5 # via ncrystal graphviz==0.21 # via -r nightly.in -h5py==3.15.1 +h5py==3.16.0 # via # scippneutron # scippnexus @@ -77,9 +77,9 @@ jedi==0.19.2 # via ipython jupyterlab-widgets==3.0.16 # via ipywidgets -kiwisolver==1.4.10rc0 +kiwisolver==1.5.0 # via matplotlib -lazy-loader==0.4 +lazy-loader==0.5 # via # plopp # scippneutron @@ -93,7 +93,7 @@ matplotlib==3.10.8 # plopp matplotlib-inline==0.2.1 # via ipython -mpltoolbox==25.10.0 +mpltoolbox==26.2.0 # via scippneutron ncrystal[cif]==4.2.12 # via -r nightly.in @@ -103,7 +103,7 @@ ncrystal-python==4.2.12 # via ncrystal networkx==3.6.1 # via cyclebane -numpy==2.4.2 +numpy==2.4.3 # via # -r nightly.in # ase @@ -125,7 +125,7 @@ packaging==26.0 # matplotlib # pooch # pytest -pandas==3.0.0 +pandas==3.0.1 # via -r nightly.in parso==0.8.6 # via jedi @@ -135,7 +135,7 @@ pexpect==4.9.0 # via ipython pillow==12.1.1 # via matplotlib -platformdirs==4.5.1 +platformdirs==4.9.4 # via pooch plopp @ git+https://github.com/scipp/plopp@main # via @@ -154,9 +154,9 @@ ptyprocess==0.7.0 # via pexpect pure-eval==0.2.3 # via stack-data -pydantic==2.12.5 +pydantic==2.13.0b2 # via scippneutron -pydantic-core==2.41.5 +pydantic-core==2.42.0 # via pydantic pygments==2.19.2 # via @@ -198,7 +198,7 @@ scippnexus @ git+https://github.com/scipp/scippnexus@main # -r nightly.in # essreduce # scippneutron -scipy==1.17.0 +scipy==1.17.1 # via # ase # scippneutron diff --git a/requirements/static.txt b/requirements/static.txt index 75cd3c9b..7f8cd35f 100644 --- a/requirements/static.txt +++ b/requirements/static.txt @@ -9,17 +9,23 @@ cfgv==3.5.0 # via pre-commit distlib==0.4.0 # via virtualenv -filelock==3.20.3 - # via virtualenv -identify==2.6.16 +filelock==3.25.0 + # via + # python-discovery + # virtualenv +identify==2.6.17 # via pre-commit nodeenv==1.10.0 # via pre-commit -platformdirs==4.5.1 - # via virtualenv +platformdirs==4.9.4 + # via + # python-discovery + # virtualenv pre-commit==4.5.1 # via -r static.in +python-discovery==1.1.1 + # via virtualenv pyyaml==6.0.3 # via pre-commit -virtualenv==20.36.1 +virtualenv==21.1.0 # via pre-commit diff --git a/src/ess/dream/workflows.py b/src/ess/dream/workflows.py index b8742f05..9c8d9ce6 100644 --- a/src/ess/dream/workflows.py +++ b/src/ess/dream/workflows.py @@ -122,6 +122,15 @@ def DreamWorkflow(**kwargs) -> sciline.Pipeline: wf[NeXusName[CaveMonitor]] = "monitor_cave" wf.insert(_get_lookup_table_filename_from_configuration) wf[ReducerSoftware] = _collect_reducer_software() + wf[LookupTableRelativeErrorThreshold] = { + "endcap_backward_detector": float('inf'), + "endcap_forward_detector": float('inf'), + "mantle_detector": float('inf'), + "high_resolution_detector": float('inf'), + "sans_detector": float('inf'), + "monitor_bunker": float('inf'), + "monitor_cave": float('inf'), + } return wf @@ -210,7 +219,14 @@ def DreamGeant4Workflow(*, run_norm: RunNormalization, **kwargs) -> sciline.Pipe AccumulatedProtonCharge[VanadiumRun]: charge, AccumulatedProtonCharge[EmptyCanRun]: charge, CaveMonitorPosition: sc.vector([0.0, 0.0, -4220.0], unit='mm'), - LookupTableRelativeErrorThreshold: 0.02, + LookupTableRelativeErrorThreshold: { + "mantle": 0.02, + "endcap_forward": 0.02, + "endcap_backward": 0.02, + "high_resolution": 0.02, + "monitor_bunker": float("inf"), + "monitor_cave": float("inf"), + }, } for key, value in additional_parameters.items(): wf[key] = value