Skip to content

Commit 2fcb973

Browse files
authored
Merge pull request #246 from scipp/lookup-error-threshold
Lookup relative error threshold
2 parents 4d9870b + 6924361 commit 2fcb973

File tree

15 files changed

+120
-100
lines changed

15 files changed

+120
-100
lines changed

docs/user-guide/loki/loki-make-tof-lookup-table.ipynb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@
4848
"wf[time_of_flight.PulseStride] = 1\n",
4949
"wf[time_of_flight.LtotalRange] = sc.scalar(9.0, unit=\"m\"), sc.scalar(35.0, unit=\"m\")\n",
5050
"wf[time_of_flight.DistanceResolution] = sc.scalar(0.1, unit=\"m\")\n",
51-
"wf[time_of_flight.TimeResolution] = sc.scalar(250.0, unit='us')\n",
52-
"wf[time_of_flight.LookupTableRelativeErrorThreshold] = 1.0"
51+
"wf[time_of_flight.TimeResolution] = sc.scalar(250.0, unit='us')"
5352
]
5453
},
5554
{
@@ -117,7 +116,7 @@
117116
"name": "python",
118117
"nbconvert_exporter": "python",
119118
"pygments_lexer": "ipython3",
120-
"version": "3.12.7"
119+
"version": "3.11.10"
121120
}
122121
},
123122
"nbformat": 4,

docs/user-guide/loki/loki-reduction-ess.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
"name": "python",
156156
"nbconvert_exporter": "python",
157157
"pygments_lexer": "ipython3",
158-
"version": "3.12.7"
158+
"version": "3.11.10"
159159
}
160160
},
161161
"nbformat": 4,

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ requires-python = ">=3.11"
3232
dependencies = [
3333
"dask>=2022.1.0",
3434
"graphviz>=0.20",
35-
"essreduce>=26.01.0",
35+
"essreduce>=26.3.1",
3636
"numpy>=1.26.4",
3737
"pandas>=2.1.2",
3838
"plopp>=25.10.0",

requirements/base.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
55
dask>=2022.1.0
66
graphviz>=0.20
7-
essreduce>=26.01.0
7+
essreduce>=26.3.1
88
numpy>=1.26.4
99
pandas>=2.1.2
1010
plopp>=25.10.0

requirements/base.txt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:1189f4e0fca2ce44df155754d5138de237818e68
1+
# SHA1:0260a75a29cca7526b260641dc9f8ceed51c38e9
22
#
33
# This file was generated by pip-compile-multi.
44
# To update, run:
@@ -21,25 +21,25 @@ cyclebane==24.10.0
2121
# via sciline
2222
cycler==0.12.1
2323
# via matplotlib
24-
dask==2026.1.1
24+
dask==2026.1.2
2525
# via -r base.in
2626
decorator==5.2.1
2727
# via ipython
2828
dnspython==2.8.0
2929
# via email-validator
3030
email-validator==2.3.0
3131
# via scippneutron
32-
essreduce==26.1.1
32+
essreduce==26.3.1
3333
# via -r base.in
3434
executing==2.2.1
3535
# via stack-data
36-
fonttools==4.61.1
36+
fonttools==4.62.0
3737
# via matplotlib
38-
fsspec==2026.1.0
38+
fsspec==2026.2.0
3939
# via dask
4040
graphviz==0.21
4141
# via -r base.in
42-
h5py==3.15.1
42+
h5py==3.16.0
4343
# via
4444
# scippneutron
4545
# scippnexus
@@ -49,7 +49,7 @@ importlib-metadata==8.7.1
4949
# via dask
5050
ipydatawidgets==4.3.5
5151
# via pythreejs
52-
ipython==9.9.0
52+
ipython==9.10.0
5353
# via ipywidgets
5454
ipython-pygments-lexers==1.1.1
5555
# via ipython
@@ -61,9 +61,9 @@ jedi==0.19.2
6161
# via ipython
6262
jupyterlab-widgets==3.0.16
6363
# via ipywidgets
64-
kiwisolver==1.4.9
64+
kiwisolver==1.5.0
6565
# via matplotlib
66-
lazy-loader==0.4
66+
lazy-loader==0.5
6767
# via
6868
# plopp
6969
# scippneutron
@@ -75,11 +75,11 @@ matplotlib==3.10.8
7575
# plopp
7676
matplotlib-inline==0.2.1
7777
# via ipython
78-
mpltoolbox==25.10.0
78+
mpltoolbox==26.2.0
7979
# via scippneutron
8080
networkx==3.6.1
8181
# via cyclebane
82-
numpy==2.4.1
82+
numpy==2.4.3
8383
# via
8484
# -r base.in
8585
# contourpy
@@ -96,17 +96,17 @@ packaging==26.0
9696
# dask
9797
# lazy-loader
9898
# matplotlib
99-
pandas==3.0.0
99+
pandas==3.0.1
100100
# via -r base.in
101-
parso==0.8.5
101+
parso==0.8.6
102102
# via jedi
103103
partd==1.4.2
104104
# via dask
105105
pexpect==4.9.0
106106
# via ipython
107-
pillow==12.1.0
107+
pillow==12.1.1
108108
# via matplotlib
109-
plopp==25.11.0
109+
plopp==26.3.0
110110
# via
111111
# -r base.in
112112
# scippneutron
@@ -139,22 +139,22 @@ sciline==25.11.1
139139
# via
140140
# -r base.in
141141
# essreduce
142-
scipp==26.1.1
142+
scipp==26.3.0
143143
# via
144144
# -r base.in
145145
# essreduce
146146
# scippneutron
147147
# scippnexus
148-
scippneutron==25.11.2
148+
scippneutron==26.3.0
149149
# via
150150
# -r base.in
151151
# essreduce
152-
scippnexus==26.1.0
152+
scippnexus==26.1.1
153153
# via
154154
# -r base.in
155155
# essreduce
156156
# scippneutron
157-
scipy==1.17.0
157+
scipy==1.17.1
158158
# via
159159
# scippneutron
160160
# scippnexus
@@ -183,7 +183,7 @@ typing-extensions==4.15.0
183183
# typing-inspection
184184
typing-inspection==0.4.2
185185
# via pydantic
186-
wcwidth==0.3.0
186+
wcwidth==0.6.0
187187
# via prompt-toolkit
188188
widgetsnbextension==4.0.15
189189
# via ipywidgets

requirements/basetest.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
#
88
asttokens==3.0.1
99
# via stack-data
10-
certifi==2026.1.4
10+
certifi==2026.2.25
1111
# via requests
12-
charset-normalizer==3.4.4
12+
charset-normalizer==3.4.5
1313
# via requests
1414
comm==0.2.3
1515
# via ipywidgets
@@ -21,15 +21,15 @@ decorator==5.2.1
2121
# via ipython
2222
executing==2.2.1
2323
# via stack-data
24-
fonttools==4.61.1
24+
fonttools==4.62.0
2525
# via matplotlib
2626
idna==3.11
2727
# via requests
2828
iniconfig==2.3.0
2929
# via pytest
3030
ipympl==0.10.0
3131
# via -r basetest.in
32-
ipython==9.9.0
32+
ipython==9.10.0
3333
# via
3434
# ipympl
3535
# ipywidgets
@@ -41,13 +41,13 @@ jedi==0.19.2
4141
# via ipython
4242
jupyterlab-widgets==3.0.16
4343
# via ipywidgets
44-
kiwisolver==1.4.9
44+
kiwisolver==1.5.0
4545
# via matplotlib
4646
matplotlib==3.10.8
4747
# via ipympl
4848
matplotlib-inline==0.2.1
4949
# via ipython
50-
numpy==2.4.1
50+
numpy==2.4.3
5151
# via
5252
# contourpy
5353
# ipympl
@@ -58,19 +58,19 @@ packaging==26.0
5858
# matplotlib
5959
# pooch
6060
# pytest
61-
parso==0.8.5
61+
parso==0.8.6
6262
# via jedi
6363
pexpect==4.9.0
6464
# via ipython
65-
pillow==12.1.0
65+
pillow==12.1.1
6666
# via
6767
# ipympl
6868
# matplotlib
69-
platformdirs==4.5.1
69+
platformdirs==4.9.4
7070
# via pooch
7171
pluggy==1.6.0
7272
# via pytest
73-
pooch==1.8.2
73+
pooch==1.9.0
7474
# via -r basetest.in
7575
prompt-toolkit==3.0.52
7676
# via ipython
@@ -91,7 +91,7 @@ python-dateutil==2.9.0.post0
9191
# via matplotlib
9292
requests==2.32.5
9393
# via pooch
94-
scipy==1.17.0
94+
scipy==1.17.1
9595
# via -r basetest.in
9696
six==1.17.0
9797
# via python-dateutil
@@ -107,7 +107,7 @@ typing-extensions==4.15.0
107107
# via ipython
108108
urllib3==2.6.3
109109
# via requests
110-
wcwidth==0.3.0
110+
wcwidth==0.6.0
111111
# via prompt-toolkit
112112
widgetsnbextension==4.0.15
113113
# via ipywidgets

requirements/ci.txt

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,19 @@
55
#
66
# requirements upgrade
77
#
8-
cachetools==6.2.4
8+
cachetools==7.0.5
99
# via tox
10-
certifi==2026.1.4
10+
certifi==2026.2.25
1111
# via requests
12-
chardet==5.2.0
13-
# via tox
14-
charset-normalizer==3.4.4
12+
charset-normalizer==3.4.5
1513
# via requests
1614
colorama==0.4.6
1715
# via tox
1816
distlib==0.4.0
1917
# via virtualenv
20-
filelock==3.20.3
18+
filelock==3.25.1
2119
# via
20+
# python-discovery
2221
# tox
2322
# virtualenv
2423
gitdb==4.0.12
@@ -32,21 +31,26 @@ packaging==26.0
3231
# -r ci.in
3332
# pyproject-api
3433
# tox
35-
platformdirs==4.5.1
34+
platformdirs==4.9.4
3635
# via
36+
# python-discovery
3737
# tox
3838
# virtualenv
3939
pluggy==1.6.0
4040
# via tox
4141
pyproject-api==1.10.0
4242
# via tox
43+
python-discovery==1.1.2
44+
# via virtualenv
4345
requests==2.32.5
4446
# via -r ci.in
45-
smmap==5.0.2
47+
smmap==5.0.3
4648
# via gitdb
47-
tox==4.34.1
49+
tomli-w==1.2.0
50+
# via tox
51+
tox==4.49.1
4852
# via -r ci.in
4953
urllib3==2.6.3
5054
# via requests
51-
virtualenv==20.36.1
55+
virtualenv==21.2.0
5256
# via tox

requirements/dev.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ argon2-cffi-bindings==25.1.0
2222
# via argon2-cffi
2323
arrow==1.4.0
2424
# via isoduration
25-
async-lru==2.1.0
25+
async-lru==2.2.0
2626
# via jupyterlab
2727
cffi==2.0.0
2828
# via argon2-cffi-bindings
29-
copier==9.11.2
29+
copier==9.13.1
3030
# via -r dev.in
31-
dunamai==1.25.0
31+
dunamai==1.26.0
3232
# via copier
3333
fqdn==1.5.1
3434
# via jsonschema
@@ -65,7 +65,7 @@ jupyter-server==2.17.0
6565
# notebook-shim
6666
jupyter-server-terminals==0.5.4
6767
# via jupyter-server
68-
jupyterlab==4.5.2
68+
jupyterlab==4.5.5
6969
# via -r dev.in
7070
jupyterlab-server==2.28.0
7171
# via jupyterlab
@@ -77,7 +77,7 @@ overrides==7.7.0
7777
# via jupyter-server
7878
pip-compile-multi==3.2.2
7979
# via -r dev.in
80-
pip-tools==7.5.2
80+
pip-tools==7.5.3
8181
# via pip-compile-multi
8282
plumbum==1.10.0
8383
# via copier
@@ -115,7 +115,7 @@ webcolors==25.10.0
115115
# via jsonschema
116116
websocket-client==1.9.0
117117
# via jupyter-server
118-
wheel==0.46.2
118+
wheel==0.46.3
119119
# via pip-tools
120120

121121
# The following packages are considered to be unsafe in a requirements file:

0 commit comments

Comments
 (0)