Use parametrized types

Author: jl-wynen

docs/user-guide/dream/dream-make-tof-lookup-table.ipynb

@@ -19,6 +19,7 @@
    "source": [
     "import scipp as sc\n",
     "from ess.reduce import time_of_flight\n",
+    "from ess.reduce.nexus.types import AnyRun\n",
     "from ess.dream.beamline import InstrumentConfiguration, choppers"
    ]
   },
@@ -62,7 +63,7 @@
     "wf[time_of_flight.LtotalRange] = sc.scalar(60.0, unit=\"m\"), sc.scalar(80.0, unit=\"m\")\n",
     "wf[time_of_flight.NumberOfSimulatedNeutrons] = 200_000  # Increase this number for more reliable results\n",
     "wf[time_of_flight.SourcePosition] = sc.vector([0, 0, 0], unit='m')\n",
-    "wf[time_of_flight.DiskChoppers] = disk_choppers\n",
+    "wf[time_of_flight.DiskChoppers[AnyRun]] = disk_choppers\n",
     "wf[time_of_flight.DistanceResolution] = sc.scalar(0.1, unit=\"m\")\n",
     "wf[time_of_flight.TimeResolution] = sc.scalar(250.0, unit='us')\n",
     "wf[time_of_flight.LookupTableRelativeErrorThreshold] = 0.02\n",

src/ess/dream/io/cif.py

@@ -15,6 +15,7 @@
     ReducedEmptyCanSubtractedTofCIF,
     ReducedTofCIF,
     ReducerSoftware,
+    SampleRun,
     Source,
 )
 
@@ -23,8 +24,8 @@ def prepare_reduced_tof_cif(
     da: IntensityTof,
     *,
     authors: CIFAuthors,
-    beamline: Beamline,
-    source: Source,
+    beamline: Beamline[SampleRun],
+    source: Source[SampleRun],
     reducers: ReducerSoftware,
     calibration: OutputCalibrationData,
 ) -> ReducedTofCIF:
@@ -69,8 +70,8 @@ def prepare_reduced_empty_can_subtracted_tof_cif(
     da: EmptyCanSubtractedIntensityTof,
     *,
     authors: CIFAuthors,
-    beamline: Beamline,
-    source: Source,
+    beamline: Beamline[SampleRun],
+    source: Source[SampleRun],
     reducers: ReducerSoftware,
     calibration: OutputCalibrationData,
 ) -> ReducedEmptyCanSubtractedTofCIF:
@@ -115,8 +116,8 @@ def _prepare_reduced_tof_cif_impl(
     da: IntensityTof,
     *,
     authors: CIFAuthors,
-    beamline: Beamline,
-    source: Source,
+    beamline: Beamline[SampleRun],
+    source: Source[SampleRun],
     reducers: ReducerSoftware,
     calibration: OutputCalibrationData,
 ) -> ReducedTofCIF:

tests/dream/geant4_reduction_test.py

@@ -50,6 +50,7 @@
 )
 from ess.reduce import time_of_flight
 from ess.reduce import workflow as reduce_workflow
+from ess.reduce.nexus.types import AnyRun
 
 sample_position = sc.vector([0.0, 0.0, 0.0], unit='mm')
 source_position = sc.vector([-3.478, 0.0, -76550], unit='mm')
@@ -136,7 +137,7 @@ def test_pipeline_can_compute_dspacing_result_using_lookup_table_filename(workfl
 @pytest.fixture(scope="module")
 def dream_tof_lookup_table():
     lut_wf = time_of_flight.TofLookupTableWorkflow()
-    lut_wf[time_of_flight.DiskChoppers] = dream.beamline.choppers(
+    lut_wf[time_of_flight.DiskChoppers[AnyRun]] = dream.beamline.choppers(
         dream.beamline.InstrumentConfiguration.high_flux
     )
     lut_wf[time_of_flight.SourcePosition] = dream_source_position

tests/snspowder/powgen/powgen_reduction_test.py

@@ -15,6 +15,7 @@
     DspacingBins,
     DspacingDetector,
     Filename,
+    GravityVector,
     IntensityDspacing,
     IntensityDspacingTwoTheta,
     KeepEvents,
@@ -52,6 +53,7 @@ def params():
         | (x > sc.scalar(16666.67, unit="us").to(unit=elem_unit(x))),
         TwoThetaMask: None,
         WavelengthMask: None,
+        GravityVector: sc.vector(value=[0, -1, 0]) * sc.constants.g,
         # Use bank sizes for small files
         DetectorBankSizes: {"bank": 23, "column": 7, "row": 7},
     }