Skip to content

Commit 3bd32be

Browse files
authored
Merge pull request #159 from scipp/nexus-workflow
Add an ESTIA NeXus workflow
2 parents e191524 + a323a61 commit 3bd32be

File tree

20 files changed

+272
-220
lines changed

20 files changed

+272
-220
lines changed

docs/user-guide/estia/estia-mcstas-reduction.ipynb

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"\n",
3232
"from ess.estia.load import load_mcstas_events\n",
3333
"from ess.estia.data import estia_mcstas_example, estia_mcstas_groundtruth\n",
34-
"from ess.estia import EstiaWorkflow\n",
34+
"from ess.estia import EstiaMcStasWorkflow\n",
3535
"from ess.reflectometry.types import *\n",
3636
"from ess.reflectometry.figures import wavelength_z_figure, wavelength_theta_figure, q_theta_figure"
3737
]
@@ -52,7 +52,7 @@
5252
"outputs": [],
5353
"source": [
5454
"\n",
55-
"wf = EstiaWorkflow()\n",
55+
"wf = EstiaMcStasWorkflow()\n",
5656
"wf.insert(load_mcstas_events)\n",
5757
"wf[Filename[ReferenceRun]] = estia_mcstas_example('reference')\n",
5858
"\n",
@@ -85,9 +85,19 @@
8585
]
8686
},
8787
{
88-
"cell_type": "markdown",
88+
"cell_type": "code",
89+
"execution_count": null,
8990
"id": "5",
9091
"metadata": {},
92+
"outputs": [],
93+
"source": [
94+
"wf.visualize(graph_attr={'rankdir':\"LR\"})"
95+
]
96+
},
97+
{
98+
"cell_type": "markdown",
99+
"id": "6",
100+
"metadata": {},
91101
"source": [
92102
"## Ni/Ti multilayer sample\n",
93103
"\n",
@@ -98,7 +108,7 @@
98108
{
99109
"cell_type": "code",
100110
"execution_count": null,
101-
"id": "6",
111+
"id": "7",
102112
"metadata": {},
103113
"outputs": [],
104114
"source": [
@@ -115,7 +125,7 @@
115125
},
116126
{
117127
"cell_type": "markdown",
118-
"id": "7",
128+
"id": "8",
119129
"metadata": {},
120130
"source": [
121131
"Below are a number of figures displaying different projections of the measured intensity distribution."
@@ -124,7 +134,7 @@
124134
{
125135
"cell_type": "code",
126136
"execution_count": null,
127-
"id": "8",
137+
"id": "9",
128138
"metadata": {},
129139
"outputs": [],
130140
"source": [
@@ -138,7 +148,7 @@
138148
{
139149
"cell_type": "code",
140150
"execution_count": null,
141-
"id": "9",
151+
"id": "10",
142152
"metadata": {},
143153
"outputs": [],
144154
"source": [
@@ -148,7 +158,7 @@
148158
{
149159
"cell_type": "code",
150160
"execution_count": null,
151-
"id": "10",
161+
"id": "11",
152162
"metadata": {},
153163
"outputs": [],
154164
"source": [
@@ -158,7 +168,7 @@
158168
{
159169
"cell_type": "code",
160170
"execution_count": null,
161-
"id": "11",
171+
"id": "12",
162172
"metadata": {},
163173
"outputs": [],
164174
"source": [
@@ -167,7 +177,7 @@
167177
},
168178
{
169179
"cell_type": "markdown",
170-
"id": "12",
180+
"id": "13",
171181
"metadata": {},
172182
"source": [
173183
"## Ni on Silicon"
@@ -176,7 +186,7 @@
176186
{
177187
"cell_type": "code",
178188
"execution_count": null,
179-
"id": "13",
189+
"id": "14",
180190
"metadata": {},
181191
"outputs": [],
182192
"source": [
@@ -193,7 +203,7 @@
193203
{
194204
"cell_type": "code",
195205
"execution_count": null,
196-
"id": "14",
206+
"id": "15",
197207
"metadata": {},
198208
"outputs": [],
199209
"source": [
@@ -207,7 +217,7 @@
207217
{
208218
"cell_type": "code",
209219
"execution_count": null,
210-
"id": "15",
220+
"id": "16",
211221
"metadata": {},
212222
"outputs": [],
213223
"source": [
@@ -217,7 +227,7 @@
217227
{
218228
"cell_type": "code",
219229
"execution_count": null,
220-
"id": "16",
230+
"id": "17",
221231
"metadata": {},
222232
"outputs": [],
223233
"source": [
@@ -227,7 +237,7 @@
227237
{
228238
"cell_type": "code",
229239
"execution_count": null,
230-
"id": "17",
240+
"id": "18",
231241
"metadata": {},
232242
"outputs": [],
233243
"source": [
@@ -236,7 +246,7 @@
236246
},
237247
{
238248
"cell_type": "markdown",
239-
"id": "18",
249+
"id": "19",
240250
"metadata": {},
241251
"source": [
242252
"## SiO2 on Silicon"
@@ -245,7 +255,7 @@
245255
{
246256
"cell_type": "code",
247257
"execution_count": null,
248-
"id": "19",
258+
"id": "20",
249259
"metadata": {},
250260
"outputs": [],
251261
"source": [
@@ -262,7 +272,7 @@
262272
{
263273
"cell_type": "code",
264274
"execution_count": null,
265-
"id": "20",
275+
"id": "21",
266276
"metadata": {},
267277
"outputs": [],
268278
"source": [
@@ -276,7 +286,7 @@
276286
{
277287
"cell_type": "code",
278288
"execution_count": null,
279-
"id": "21",
289+
"id": "22",
280290
"metadata": {},
281291
"outputs": [],
282292
"source": [
@@ -286,7 +296,7 @@
286296
{
287297
"cell_type": "code",
288298
"execution_count": null,
289-
"id": "22",
299+
"id": "23",
290300
"metadata": {},
291301
"outputs": [],
292302
"source": [
@@ -296,7 +306,7 @@
296306
{
297307
"cell_type": "code",
298308
"execution_count": null,
299-
"id": "23",
309+
"id": "24",
300310
"metadata": {},
301311
"outputs": [],
302312
"source": [

docs/user-guide/offspec/offspec_reduction.ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@
113113
"header.data_source.measurement = fileio.data_source.Measurement(\n",
114114
" instrument_settings=fileio.data_source.InstrumentSettings(\n",
115115
" incident_angle=fileio.base.Value(\n",
116-
" wf.compute(RawDetectorData[SampleRun]).coords[\"theta\"].value,\n",
117-
" wf.compute(RawDetectorData[SampleRun]).coords[\"theta\"].unit\n",
116+
" wf.compute(DetectorData[SampleRun]).coords[\"theta\"].value,\n",
117+
" wf.compute(DetectorData[SampleRun]).coords[\"theta\"].unit\n",
118118
" ),\n",
119119
" wavelength=None,\n",
120120
" polarization=\"unpolarized\",\n",
@@ -183,8 +183,8 @@
183183
"metadata": {},
184184
"outputs": [],
185185
"source": [
186-
"wf.compute(RawDetectorData[SampleRun]).hist(tof=50).plot(norm='log') \\\n",
187-
"+ wf.compute(RawDetectorData[ReferenceRun]).hist(tof=50).plot(norm='log')"
186+
"wf.compute(DetectorData[SampleRun]).hist(tof=50).plot(norm='log') \\\n",
187+
"+ wf.compute(DetectorData[ReferenceRun]).hist(tof=50).plot(norm='log')"
188188
]
189189
},
190190
{

requirements/base.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
annotated-types==0.7.0
99
# via pydantic
10-
click==8.1.8
10+
click==8.2.0
1111
# via dask
1212
cloudpickle==3.1.1
1313
# via dask
@@ -17,17 +17,17 @@ cyclebane==24.10.0
1717
# via sciline
1818
cycler==0.12.1
1919
# via matplotlib
20-
dask==2025.4.1
20+
dask==2025.5.0
2121
# via -r base.in
2222
dnspython==2.7.0
2323
# via email-validator
2424
email-validator==2.2.0
2525
# via scippneutron
26-
essreduce==25.5.0
26+
essreduce==25.5.1
2727
# via -r base.in
28-
fonttools==4.57.0
28+
fonttools==4.58.0
2929
# via matplotlib
30-
fsspec==2025.3.2
30+
fsspec==2025.5.0
3131
# via dask
3232
graphviz==0.20.3
3333
# via -r base.in
@@ -55,7 +55,7 @@ mpltoolbox==25.4.0
5555
# via scippneutron
5656
networkx==3.4.2
5757
# via cyclebane
58-
numpy==2.2.5
58+
numpy==2.2.6
5959
# via
6060
# contourpy
6161
# h5py
@@ -77,7 +77,7 @@ partd==1.4.2
7777
# via dask
7878
pillow==11.2.1
7979
# via matplotlib
80-
plopp==25.4.1
80+
plopp==25.5.0
8181
# via
8282
# -r base.in
8383
# scippneutron
@@ -100,7 +100,7 @@ pyyaml==6.0.2
100100
# via
101101
# dask
102102
# orsopy
103-
sciline==25.4.1
103+
sciline==25.5.1
104104
# via
105105
# -r base.in
106106
# essreduce

requirements/basetest.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ certifi==2025.4.26
99
# via requests
1010
charset-normalizer==3.4.2
1111
# via requests
12-
exceptiongroup==1.2.2
12+
exceptiongroup==1.3.0
1313
# via pytest
1414
idna==3.10
1515
# via requests
@@ -21,7 +21,7 @@ packaging==25.0
2121
# pytest
2222
platformdirs==4.3.8
2323
# via pooch
24-
pluggy==1.5.0
24+
pluggy==1.6.0
2525
# via pytest
2626
pooch==1.8.2
2727
# via -r basetest.in
@@ -31,5 +31,7 @@ requests==2.32.3
3131
# via pooch
3232
tomli==2.2.1
3333
# via pytest
34+
typing-extensions==4.13.2
35+
# via exceptiongroup
3436
urllib3==2.4.0
3537
# via requests

requirements/ci.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ platformdirs==4.3.8
3636
# via
3737
# tox
3838
# virtualenv
39-
pluggy==1.5.0
39+
pluggy==1.6.0
4040
# via tox
41-
pyproject-api==1.9.0
41+
pyproject-api==1.9.1
4242
# via tox
4343
requests==2.32.3
4444
# via -r ci.in
@@ -48,7 +48,7 @@ tomli==2.2.1
4848
# via
4949
# pyproject-api
5050
# tox
51-
tox==4.25.0
51+
tox==4.26.0
5252
# via -r ci.in
5353
typing-extensions==4.13.2
5454
# via tox

requirements/dev.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ cffi==1.17.1
2828
# via argon2-cffi-bindings
2929
copier==9.7.1
3030
# via -r dev.in
31-
dunamai==1.24.0
31+
dunamai==1.24.1
3232
# via copier
3333
fqdn==1.5.1
3434
# via jsonschema
@@ -57,7 +57,7 @@ jupyter-events==0.12.0
5757
# via jupyter-server
5858
jupyter-lsp==2.2.5
5959
# via jupyterlab
60-
jupyter-server==2.15.0
60+
jupyter-server==2.16.0
6161
# via
6262
# jupyter-lsp
6363
# jupyterlab
@@ -81,7 +81,7 @@ pip-tools==7.4.1
8181
# via pip-compile-multi
8282
plumbum==1.9.0
8383
# via copier
84-
prometheus-client==0.21.1
84+
prometheus-client==0.22.0
8585
# via jupyter-server
8686
pycparser==2.22
8787
# via cffi
@@ -107,7 +107,7 @@ terminado==0.18.1
107107
# jupyter-server-terminals
108108
toposort==1.10
109109
# via pip-compile-multi
110-
types-python-dateutil==2.9.0.20241206
110+
types-python-dateutil==2.9.0.20250516
111111
# via arrow
112112
uri-template==1.3.0
113113
# via jsonschema

requirements/docs.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ docutils==0.21.2
4848
# nbsphinx
4949
# pydata-sphinx-theme
5050
# sphinx
51-
exceptiongroup==1.2.2
51+
exceptiongroup==1.3.0
5252
# via ipython
5353
executing==2.2.0
5454
# via stack-data
@@ -182,11 +182,11 @@ requests==2.32.3
182182
# via
183183
# pooch
184184
# sphinx
185-
rpds-py==0.24.0
185+
rpds-py==0.25.0
186186
# via
187187
# jsonschema
188188
# referencing
189-
snowballstemmer==3.0.0.1
189+
snowballstemmer==3.0.1
190190
# via sphinx
191191
soupsieve==2.7
192192
# via beautifulsoup4
@@ -223,7 +223,7 @@ tinycss2==1.4.0
223223
# via bleach
224224
tomli==2.2.1
225225
# via sphinx
226-
tornado==6.4.2
226+
tornado==6.5
227227
# via
228228
# ipykernel
229229
# jupyter-client

0 commit comments

Comments
 (0)