Make metadata types generic

Author: jl-wynen

src/ess/reduce/nexus/workflow.py

@@ -47,7 +47,6 @@
     PreopenNeXusFile,
     RawChoppers,
     RunType,
-    SampleRun,
     TimeInterval,
     UniqueComponent,
 )
@@ -606,14 +605,16 @@ def _assign_values_as_variances(var: sc.Variable) -> sc.Variable:
     return var
 
 
-def load_beamline_metadata_from_nexus(file_spec: NeXusFileSpec[SampleRun]) -> Beamline:
+def load_beamline_metadata_from_nexus(
+    file_spec: NeXusFileSpec[RunType],
+) -> Beamline[RunType]:
     """Load beamline metadata from a sample NeXus file."""
     return nexus.load_metadata(file_spec.value, Beamline)
 
 
 def load_measurement_metadata_from_nexus(
-    file_spec: NeXusFileSpec[SampleRun],
-) -> Measurement:
+    file_spec: NeXusFileSpec[RunType],
+) -> Measurement[RunType]:
     """Load measurement metadata from a sample NeXus file."""
     return nexus.load_metadata(file_spec.value, Measurement)
 

tests/nexus/workflow_test.py

@@ -633,7 +633,7 @@ def test_generic_nexus_workflow_load_beamline_metadata(
 ) -> None:
     wf = GenericNeXusWorkflow(run_types=[SampleRun], monitor_types=[])
     wf[Filename[SampleRun]] = bifrost_simulated_elastic
-    beamline = wf.compute(Beamline)
+    beamline = wf.compute(Beamline[SampleRun])
 
     assert beamline.name == 'BIFROST'
     assert beamline.facility == 'ESS'
@@ -646,7 +646,7 @@ def test_generic_nexus_workflow_load_measurement_metadata(
     wf = GenericNeXusWorkflow(run_types=[SampleRun], monitor_types=[])
     wf[Filename[SampleRun]] = loki_tutorial_sample_run_60250
     wf[Filename[BackgroundRun]] = loki_tutorial_background_run_60248
-    measurement = wf.compute(Measurement)
+    measurement = wf.compute(Measurement[SampleRun])
 
     assert measurement.title == 'My experiment'
     assert measurement.experiment_id == 'p1234'