Fix type alias names

Author: jl-wynen

src/ess/dream/io/cif.py

@@ -14,7 +14,7 @@
     IofTof,
     ReducedEmptyCanSubtractedTofCIF,
     ReducedTofCIF,
-    ReducerSoftwares,
+    ReducerSoftware,
     Source,
 )
 
@@ -25,7 +25,7 @@ def prepare_reduced_tof_cif(
     authors: CIFAuthors,
     beamline: Beamline,
     source: Source,
-    reducers: ReducerSoftwares,
+    reducers: ReducerSoftware,
     calibration: OutputCalibrationData,
 ) -> ReducedTofCIF:
     """Construct a CIF builder with reduced data in d-spacing.

src/ess/dream/workflow.py

@@ -24,7 +24,7 @@
     MonitorType,
     PixelMaskFilename,
     Position,
-    ReducerSoftwares,
+    ReducerSoftware,
     ResampledMonitorTofData,
     RunType,
     SampleRun,
@@ -93,12 +93,12 @@ def default_parameters() -> dict:
         TwoThetaMask: None,
         CaveMonitorPosition: sc.vector([0.0, 0.0, -4220.0], unit='mm'),
         CIFAuthors: CIFAuthors([]),
-        ReducerSoftwares: _collect_reducer_software(),
+        ReducerSoftware: _collect_reducer_software(),
     }
 
 
-def _collect_reducer_software() -> ReducerSoftwares:
-    return ReducerSoftwares(
+def _collect_reducer_software() -> ReducerSoftware:
+    return ReducerSoftware(
         [
             Software.from_package_metadata('essdiffraction'),
             Software.from_package_metadata('scippneutron'),

src/ess/powder/types.py

@@ -68,7 +68,7 @@
 """Filename of the instrument calibration file."""
 
 
-DspacingBins = NewType("DSpacingBins", sc.Variable)
+DspacingBins = NewType("DspacingBins", sc.Variable)
 """Bin edges for d-spacing."""
 
 
@@ -216,7 +216,7 @@ class RawDataAndMetadata(sciline.Scope[RunType, sc.DataGroup], sc.DataGroup):
 Beamline = reduce_t.Beamline
 """Beamline metadata."""
 
-ReducerSoftwares = NewType('ReducerSoftware', list[Software])
+ReducerSoftware = NewType('ReducerSoftware', list[Software])
 """Pieces of software used to reduce the data."""
 
 Source = reduce_t.Source

tests/dream/io/cif_test.py

@@ -10,7 +10,7 @@
 
 import ess.dream.io.cif
 from ess.powder.calibration import OutputCalibrationData
-from ess.powder.types import Beamline, CIFAuthors, IofTof, ReducerSoftwares, Software
+from ess.powder.types import Beamline, CIFAuthors, IofTof, ReducerSoftware, Software
 
 
 @pytest.fixture
@@ -54,7 +54,7 @@ def test_save_reduced_tof(ioftof: IofTof, cal: OutputCalibrationData) -> None:
             site="ESS",
         ),
         source=ESS_SOURCE,
-        reducers=ReducerSoftwares(
+        reducers=ReducerSoftware(
             [
                 Software.from_package_metadata('ess.diffraction'),
                 Software.from_package_metadata('ess.dream'),