Construct OrsoExperiment from generic workflow

Author: jl-wynen

src/ess/amor/load.py

@@ -3,18 +3,24 @@
 import scipp as sc
 import scippnexus as snx
 
+from ess.reduce.nexus import workflow as nexus_workflow
+from ess.reduce.nexus.types import NeXusFileSpec
+
 from ..reflectometry.load import load_nx
 from ..reflectometry.types import (
+    Beamline,
     BeamSize,
     DetectorData,
     DetectorRotation,
     Filename,
+    Measurement,
     NeXusComponent,
     NeXusDetectorName,
     ProtonCurrent,
     RawSampleRotation,
     RunType,
     SampleRotation,
+    SampleRun,
     SampleSize,
 )
 from .geometry import pixel_coordinates_in_detector_system
@@ -127,6 +133,18 @@ def load_amor_proton_current(
     return pc
 
 
+def load_beamline_metadata(filename: Filename[SampleRun]) -> Beamline:
+    return nexus_workflow.load_beamline_metadata_from_nexus(
+        NeXusFileSpec[SampleRun](filename)
+    )
+
+
+def load_measurement_metadata(filename: Filename[SampleRun]) -> Measurement:
+    return nexus_workflow.load_measurement_metadata_from_nexus(
+        NeXusFileSpec[SampleRun](filename)
+    )
+
+
 providers = (
     load_detector,
     load_events,
@@ -138,4 +156,6 @@ def load_amor_proton_current(
     load_amor_detector_rotation,
     load_amor_proton_current,
     amor_chopper,
+    load_beamline_metadata,
+    load_measurement_metadata,
 )

src/ess/reflectometry/orso.py

@@ -13,14 +13,15 @@
 
 import numpy as np
 import scipp as sc
-from dateutil.parser import parse as parse_datetime
 from orsopy.fileio import base as orso_base
 from orsopy.fileio import data_source, orso, reduction
 from orsopy.fileio.orso import Column, Orso, OrsoDataset
 
 from .load import load_nx
 from .types import (
+    Beamline,
     Filename,
+    Measurement,
     ReducibleData,
     ReferenceRun,
     ReflectivityOverQ,
@@ -60,21 +61,18 @@
 OrsoCorrectionList = NewType("OrsoCorrectionList", list[str])
 
 
-def parse_orso_experiment(filename: Filename[SampleRun]) -> OrsoExperiment:
+def parse_orso_experiment(
+    beamline: Beamline, measurement: Measurement
+) -> OrsoExperiment:
     """Parse ORSO experiment metadata from raw NeXus data."""
-    title, instrument_name, facility, start_time = load_nx(
-        filename,
-        "NXentry/title",
-        "NXentry/NXinstrument/name",
-        "NXentry/facility",
-        "NXentry/start_time",
-    )
     return OrsoExperiment(
         data_source.Experiment(
-            title=title,
-            instrument=instrument_name,
-            facility=facility,
-            start_date=parse_datetime(start_time),
+            instrument=beamline.name,
+            facility=beamline.facility,
+            title=measurement.title,
+            start_date=measurement.start_time,
+            proposalID=measurement.experiment_id,
+            doi=measurement.experiment_doi,
             probe="neutron",
         )
     )
@@ -101,7 +99,7 @@ def parse_orso_sample(filename: Filename[SampleRun]) -> OrsoSample:
         data_source.Sample(
             name=sample["name"],
             model=data_source.SampleModel(
-                stack=sample["model"],
+                stack=sample.get("model", ""),
             ),
         )
     )

src/ess/reflectometry/types.py

@@ -4,17 +4,20 @@
 
 import sciline
 import scipp as sc
+
 from ess.reduce.nexus import types as reduce_t
 
 SampleRun = reduce_t.SampleRun
 # `VanadiumRun` is not the best name, see https://github.com/scipp/essreduce/issues/238
 ReferenceRun = reduce_t.VanadiumRun
 RunType = TypeVar("RunType", ReferenceRun, SampleRun)
 
+Beamline = reduce_t.Beamline
 CalibratedDetector = reduce_t.CalibratedDetector
 DetectorData = reduce_t.DetectorData
 DetectorPositionOffset = reduce_t.DetectorPositionOffset
 Filename = reduce_t.Filename
+Measurement = reduce_t.Measurement
 NeXusComponent = reduce_t.NeXusComponent
 NeXusDetectorName = reduce_t.NeXusDetectorName
 Position = reduce_t.Position