Add measurement metadata to CIF

Author: jl-wynen

src/ess/dream/io/cif.py

@@ -12,6 +12,7 @@
     CIFAuthors,
     EmptyCanSubtractedIntensityTof,
     IntensityTof,
+    Measurement,
     ReducedEmptyCanSubtractedTofCIF,
     ReducedTofCIF,
     ReducerSoftware,
@@ -26,6 +27,7 @@ def prepare_reduced_tof_cif(
     authors: CIFAuthors,
     beamline: Beamline[SampleRun],
     source: Source[SampleRun],
+    measurement: Measurement[SampleRun],
     reducers: ReducerSoftware,
     calibration: OutputCalibrationData,
 ) -> ReducedTofCIF:
@@ -61,6 +63,7 @@ def prepare_reduced_tof_cif(
         authors=authors,
         beamline=beamline,
         source=source,
+        measurement=measurement,
         reducers=reducers,
         calibration=calibration,
     )
@@ -72,6 +75,7 @@ def prepare_reduced_empty_can_subtracted_tof_cif(
     authors: CIFAuthors,
     beamline: Beamline[SampleRun],
     source: Source[SampleRun],
+    measurement: Measurement[SampleRun],
     reducers: ReducerSoftware,
     calibration: OutputCalibrationData,
 ) -> ReducedEmptyCanSubtractedTofCIF:
@@ -107,6 +111,7 @@ def prepare_reduced_empty_can_subtracted_tof_cif(
         authors=authors,
         beamline=beamline,
         source=source,
+        measurement=measurement,
         reducers=reducers,
         calibration=calibration,
     )
@@ -118,12 +123,14 @@ def _prepare_reduced_tof_cif_impl(
     authors: CIFAuthors,
     beamline: Beamline[SampleRun],
     source: Source[SampleRun],
+    measurement: Measurement[SampleRun],
     reducers: ReducerSoftware,
     calibration: OutputCalibrationData,
 ) -> ReducedTofCIF:
     to_save = _prepare_data(da)
     return ReducedTofCIF(
         cif.CIF('reduced_tof')
+        .with_measurement(measurement)
         .with_reducers(*(reducer.compact_repr for reducer in reducers))
         .with_authors(*authors)
         .with_beamline(beamline, source)

src/ess/powder/types.py

@@ -215,6 +215,9 @@ class RawDataAndMetadata(sciline.Scope[RunType, sc.DataGroup], sc.DataGroup):
 Beamline = reduce_t.Beamline
 """Beamline metadata."""
 
+Measurement = reduce_t.Measurement
+"""Measurement metadata."""
+
 ReducerSoftware = NewType('ReducerSoftware', list[Software])
 """Pieces of software used to reduce the data."""