Remove ScalarCalibrationData alias

Author: jl-wynen

src/ess/powder/calibration.py

@@ -5,18 +5,17 @@
 from __future__ import annotations
 
 from collections.abc import Callable, ItemsView, Iterable, Iterator, KeysView, Mapping
-from typing import NewType
 
 import scipp as sc
 import scipp.constants
 
 from .types import DspacingData, SampleRun
 
 
-class ScalarCalibrationData(Mapping[int, sc.Variable]):
+class OutputCalibrationData(Mapping[int, sc.Variable]):
     r"""Calibration data for output ToF data.
 
-    Only of value is stored per coefficient.
+    Only one value is stored per coefficient.
     This means that individual detector pixels are *not* resolved but merged
     into average quantities.
 
@@ -70,14 +69,14 @@ def d_to_tof(dspacing: sc.Variable) -> sc.Variable:
 
         return d_to_tof
 
-    def to_cif_units(self) -> ScalarCalibrationData:
+    def to_cif_units(self) -> OutputCalibrationData:
         """Convert to the units used in CIF pd_calib_d_to_tof."""
 
         def unit(p: int) -> sc.Unit:
             base = sc.Unit(f'us / (angstrom^{abs(p)})')
             return sc.reciprocal(base) if p < 0 else base
 
-        return ScalarCalibrationData({p: c.to(unit=unit(p)) for p, c in self.items()})
+        return OutputCalibrationData({p: c.to(unit=unit(p)) for p, c in self.items()})
 
     def to_cif_format(self) -> sc.DataArray:
         """Convert to a data array that can be saved to CIF.
@@ -94,9 +93,6 @@ def to_cif_format(self) -> sc.DataArray:
         )
 
 
-OutputCalibrationData = NewType('OutputCalibrationData', ScalarCalibrationData)
-
-
 def assemble_output_calibration(
     data: DspacingData[SampleRun],
 ) -> OutputCalibrationData:
@@ -112,7 +108,7 @@ def assemble_output_calibration(
         * sc.sin(0.5 * average_two_theta),
         unit='us / angstrom',
     )
-    return OutputCalibrationData(ScalarCalibrationData({1: difc}))
+    return OutputCalibrationData({1: difc})
 
 
 providers = (assemble_output_calibration,)

tests/dream/io/cif_test.py

@@ -8,7 +8,7 @@
 from scippneutron.io import cif
 
 import ess.dream.io.cif
-from ess.powder.calibration import OutputCalibrationData, ScalarCalibrationData
+from ess.powder.calibration import OutputCalibrationData
 from ess.powder.types import CIFAuthors, IofTof
 
 
@@ -25,13 +25,11 @@ def ioftof() -> IofTof:
 @pytest.fixture
 def cal() -> OutputCalibrationData:
     return OutputCalibrationData(
-        ScalarCalibrationData(
-            {
-                0: sc.scalar(0.2, unit='us'),
-                1: sc.scalar(1.2, unit='us/angstrom'),
-                2: sc.scalar(-1.4, unit='us/angstrom^2'),
-            }
-        )
+        {
+            0: sc.scalar(0.2, unit='us'),
+            1: sc.scalar(1.2, unit='us/angstrom'),
+            2: sc.scalar(-1.4, unit='us/angstrom^2'),
+        }
     )