Skip to content

Commit 6e289cc

Browse files
committed
Set Measurement metadata in geant4 pipeline
1 parent f4413cb commit 6e289cc

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

src/ess/dream/workflows.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
EmptyCanRun,
2020
KeepEvents,
2121
LookupTableRelativeErrorThreshold,
22+
Measurement,
2223
PixelMaskFilename,
2324
Position,
2425
ReducerSoftware,
@@ -227,6 +228,10 @@ def DreamGeant4Workflow(*, run_norm: RunNormalization, **kwargs) -> sciline.Pipe
227228
"monitor_bunker": float("inf"),
228229
"monitor_cave": float("inf"),
229230
},
231+
# The GEANT4 files do not encode measurement information
232+
Measurement[SampleRun]: Measurement[SampleRun](title=None),
233+
Measurement[VanadiumRun]: Measurement[VanadiumRun](title=None),
234+
Measurement[EmptyCanRun]: Measurement[EmptyCanRun](title=None),
230235
}
231236
for key, value in additional_parameters.items():
232237
wf[key] = value

tests/dream/io/cif_test.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: BSD-3-Clause
22
# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
3-
3+
import datetime
44
import io
55

66
import pytest
@@ -14,6 +14,7 @@
1414
Beamline,
1515
CIFAuthors,
1616
IntensityTof,
17+
Measurement,
1718
ReducerSoftware,
1819
Software,
1920
)
@@ -60,6 +61,10 @@ def test_save_reduced_tof(ioftof: IntensityTof, cal: OutputCalibrationData) -> N
6061
site="ESS",
6162
),
6263
source=ESS_SOURCE,
64+
measurement=Measurement(
65+
title="Test measurement",
66+
start_time=datetime.datetime(2026, 1, 2, 14, 58, 2, tzinfo=datetime.UTC),
67+
),
6368
reducers=ReducerSoftware(
6469
[
6570
Software.from_package_metadata('ess.diffraction'),
@@ -78,6 +83,8 @@ def test_save_reduced_tof(ioftof: IntensityTof, cal: OutputCalibrationData) -> N
7883
assert f"ess.dream {__version__}" in result
7984
assert f"ess.powder {__version__}" in result
8085
assert '_diffrn_source.beamline DREAM' in result
86+
assert "_sc_meas.title 'Test measurement'" in result
87+
assert "_pd_meas.datetime_initiated 2026-01-02T14:58:02" in result
8188
assert 'ZERO 0 0.2' in result
8289
assert 'DIFC 1 1.2' in result
8390
assert 'DIFA 2 -1.4' in result

0 commit comments

Comments
 (0)