Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions docs/odin/odin-make-tof-lookup-table.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,9 @@
"wf[time_of_flight.NumberOfSimulatedNeutrons] = 200_000 # Increase this number for more reliable results\n",
"wf[time_of_flight.SimulationSeed] = 1234\n",
"wf[time_of_flight.PulseStride] = 2\n",
"wf[time_of_flight.LtotalRange] = sc.scalar(55.0, unit=\"m\"), sc.scalar(65.0, unit=\"m\")\n",
"wf[time_of_flight.LtotalRange] = sc.scalar(5.0, unit=\"m\"), sc.scalar(65.0, unit=\"m\")\n",
"wf[time_of_flight.DistanceResolution] = sc.scalar(0.1, unit=\"m\")\n",
"wf[time_of_flight.TimeResolution] = sc.scalar(250.0, unit='us')\n",
"wf[time_of_flight.LookupTableRelativeErrorThreshold] = 0.02"
"wf[time_of_flight.TimeResolution] = sc.scalar(250.0, unit='us')"
]
},
{
Expand All @@ -67,7 +66,7 @@
"outputs": [],
"source": [
"table = wf.compute(time_of_flight.TimeOfFlightLookupTable)\n",
"table"
"table.array"
]
},
{
Expand Down Expand Up @@ -95,10 +94,8 @@
"metadata": {},
"outputs": [],
"source": [
"# Save chopper metadata\n",
"table.choppers = sc.DataGroup(disk_choppers)\n",
"# Write to file\n",
"table.save_hdf5('ODIN-tof-lookup-table.h5')"
"table.save_hdf5('ODIN-tof-lookup-table-5m-65m.h5')"
]
}
],
Expand All @@ -117,7 +114,8 @@
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3"
"pygments_lexer": "ipython3",
"version": "3.12.12"
}
},
"nbformat": 4,
Expand Down
13 changes: 6 additions & 7 deletions docs/tbl/tbl-make-tof-lookup-table.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,9 @@
"wf[time_of_flight.NumberOfSimulatedNeutrons] = 200_000 # Increase this number for more reliable results\n",
"wf[time_of_flight.SimulationSeed] = 1234\n",
"wf[time_of_flight.PulseStride] = 1\n",
"wf[time_of_flight.LtotalRange] = sc.scalar(25.0, unit=\"m\"), sc.scalar(35.0, unit=\"m\")\n",
"wf[time_of_flight.LtotalRange] = sc.scalar(5.0, unit=\"m\"), sc.scalar(35.0, unit=\"m\")\n",
"wf[time_of_flight.DistanceResolution] = sc.scalar(0.1, unit=\"m\")\n",
"wf[time_of_flight.TimeResolution] = sc.scalar(250.0, unit='us')\n",
"wf[time_of_flight.LookupTableRelativeErrorThreshold] = 1.0"
"wf[time_of_flight.TimeResolution] = sc.scalar(250.0, unit='us')"
]
},
{
Expand All @@ -65,7 +64,7 @@
"outputs": [],
"source": [
"table = wf.compute(time_of_flight.TimeOfFlightLookupTable)\n",
"table"
"table.array"
]
},
{
Expand All @@ -75,7 +74,7 @@
"metadata": {},
"outputs": [],
"source": [
"table.plot()"
"table.plot(title=\"Predicted time-of-flight\") + sc.stddevs(table.array).plot(title=\"Standard deviation\")"
]
},
{
Expand All @@ -95,7 +94,7 @@
"source": [
"# Save chopper metadata\n",
"# Write to file\n",
"table.save_hdf5('TBL-tof-lookup-table-no-choppers.h5')"
"table.save_hdf5('TBL-tof-lookup-table-no-choppers-5m-35m.h5')"
]
}
],
Expand All @@ -115,7 +114,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.12.7"
"version": "3.12.12"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies = [
"scippneutron>=24.12.0",
"scippnexus>=23.11.1",
"tifffile>=2024.7.2",
"essreduce>=25.11.2",
"essreduce>=26.2.1",
"scitiff>=25.7",
]

Expand Down
2 changes: 1 addition & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ scipp>=25.4.0
scippneutron>=24.12.0
scippnexus>=23.11.1
tifffile>=2024.7.2
essreduce>=25.11.2
essreduce>=26.2.1
scitiff>=25.7
14 changes: 7 additions & 7 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:a1100845ace4b19ad8a759324efbe63c69022f7b
# SHA1:25cc169af2b425517b579101f3f19c2bdc88e9b2
#
# This file was generated by pip-compile-multi.
# To update, run:
Expand Down Expand Up @@ -33,13 +33,13 @@ dnspython==2.8.0
# via email-validator
email-validator==2.3.0
# via scippneutron
essreduce==26.2.0
essreduce==26.2.2
# via -r base.in
executing==2.2.1
# via stack-data
fonttools==4.61.1
# via matplotlib
fsspec==2026.1.0
fsspec==2026.2.0
# via dask
graphviz==0.21
# via
Expand Down Expand Up @@ -115,17 +115,17 @@ packaging==26.0
# dask
# lazy-loader
# matplotlib
parso==0.8.5
parso==0.8.6
# via jedi
partd==1.4.2
# via dask
pexpect==4.9.0
# via ipython
pillow==12.1.0
pillow==12.1.1
# via
# ipympl
# matplotlib
plopp[all]==25.11.0
plopp[all]==26.2.0
# via
# -r base.in
# scippneutron
Expand Down Expand Up @@ -221,7 +221,7 @@ typing-extensions==4.15.0
# typing-inspection
typing-inspection==0.4.2
# via pydantic
wcwidth==0.5.3
wcwidth==0.6.0
# via prompt-toolkit
widgetsnbextension==4.0.15
# via ipywidgets
Expand Down
4 changes: 2 additions & 2 deletions requirements/basetest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ packaging==26.0
# matplotlib
# pooch
# pytest
pillow==12.1.0
pillow==12.1.1
# via matplotlib
platformdirs==4.5.1
# via pooch
plopp==25.11.0
plopp==26.2.0
# via tof
pluggy==1.6.0
# via pytest
Expand Down
2 changes: 1 addition & 1 deletion requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# requirements upgrade
#
cachetools==7.0.0
cachetools==7.0.1
# via tox
certifi==2026.1.4
# via requests
Expand Down
4 changes: 2 additions & 2 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jupyter-server==2.17.0
# notebook-shim
jupyter-server-terminals==0.5.4
# via jupyter-server
jupyterlab==4.5.3
jupyterlab==4.5.4
# via -r dev.in
jupyterlab-server==2.28.0
# via jupyterlab
Expand All @@ -78,7 +78,7 @@ overrides==7.7.0
# via jupyter-server
pip-compile-multi==3.2.2
# via -r dev.in
pip-tools==7.5.2
pip-tools==7.5.3
# via pip-compile-multi
plumbum==1.10.0
# via copier
Expand Down
6 changes: 2 additions & 4 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ accessible-pygments==0.0.5
# via pydata-sphinx-theme
alabaster==1.0.0
# via sphinx
appnope==0.1.4
# via ipykernel
autodoc-pydantic==2.2.0
# via -r docs.in
babel==2.18.0
Expand Down Expand Up @@ -42,7 +40,7 @@ fastjsonschema==2.21.2
# via nbformat
imagesize==1.4.1
# via sphinx
ipykernel==7.1.0
ipykernel==7.2.0
# via -r docs.in
jinja2==3.1.6
# via
Expand Down Expand Up @@ -160,7 +158,7 @@ tornado==6.5.4
# via
# ipykernel
# jupyter-client
tqdm==4.67.2
tqdm==4.67.3
# via -r docs.in
urllib3==2.6.3
# via requests
Expand Down
4 changes: 2 additions & 2 deletions requirements/nightly.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ essreduce @ git+https://github.com/scipp/essreduce@main
# via -r nightly.in
fonttools==4.61.1
# via matplotlib
fsspec==2026.1.0
fsspec==2026.2.0
# via dask
graphviz==0.21
# via -r nightly.in
Expand Down Expand Up @@ -93,7 +93,7 @@ packaging==26.0
# pytest
partd==1.4.2
# via dask
pillow==12.1.0
pillow==12.1.1
# via matplotlib
platformdirs==4.5.1
# via pooch
Expand Down
5 changes: 3 additions & 2 deletions src/ess/odin/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"iron_simulation_sample_large.nxs": "md5:c162b6abeccb51984880d8d5002bae95",
"iron_simulation_sample_small.nxs": "md5:dda6fb30aa88780c5a3d4cef6ea05278",
"ODIN-tof-lookup-table.h5": "md5:e657021f4508f167b2a2eb550853b06b",
"ODIN-tof-lookup-table-5m-65m.h5": "md5:c815eed6835a98d0b8d5252ffe250964",
},
)

Expand Down Expand Up @@ -62,10 +63,10 @@ def iron_simulation_ob_large() -> pathlib.Path:
def odin_tof_lookup_table() -> pathlib.Path:
"""
Odin TOF lookup table.
This file is used to convert the time-of-flight to wavelength.
This file is used to convert the raw ``event_time_offset`` to time-of-flight.

This table was computed using `Create a time-of-flight lookup table for ODIN
<../../odin/odin-make-tof-lookup-table.rst>`_
with ``NumberOfSimulatedNeutrons = 5_000_000``.
"""
return _registry.get_path("ODIN-tof-lookup-table.h5")
return _registry.get_path("ODIN-tof-lookup-table-5m-65m.h5")
5 changes: 3 additions & 2 deletions src/ess/tbl/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
files={
"tbl_sample_data_2025-03.hdf": "md5:12db6bc06721278b3abe47992eac3e77",
"TBL-tof-lookup-table-no-choppers.h5": "md5:8bc98fac0ee64fc8f5decf509c75bafe",
"TBL-tof-lookup-table-no-choppers-5m-35m.h5": "md5:be7e73f32d395abd3c28b95f75934d61", # noqa: E501
'tbl-orca-focussing.hdf.zip': Entry(
alg='md5', chk='f365acd9ea45dd205c0b9398d163cfa4', unzip=True
),
Expand All @@ -34,9 +35,9 @@ def tbl_tof_lookup_table_no_choppers() -> pathlib.Path:

This table was computed using `Create a time-of-flight lookup table for TBL
<../../tbl/tbl-make-tof-lookup-table.rst>`_
with ``NumberOfSimulatedNeutrons = 2_000_000``.
with ``NumberOfSimulatedNeutrons = 5_000_000``.
"""
return _registry.get_path("TBL-tof-lookup-table-no-choppers.h5")
return _registry.get_path("TBL-tof-lookup-table-no-choppers-5m-35m.h5")


def tbl_orca_focussing_data() -> pathlib.Path:
Expand Down
Loading