diff --git a/src/ess/isissans/components.py b/src/ess/isissans/components.py index a0891ca2..4b35d256 100644 --- a/src/ess/isissans/components.py +++ b/src/ess/isissans/components.py @@ -6,7 +6,7 @@ import scipp as sc from ..sans.types import ( - ConfiguredReducibleDataData, + ConfiguredReducibleData, ConfiguredReducibleMonitor, MonitorType, RawData, @@ -28,7 +28,7 @@ def apply_component_user_offsets_to_raw_data( data: RawData[ScatteringRunType], sample_offset: SampleOffset, detector_bank_offset: DetectorBankOffset, -) -> ConfiguredReducibleDataData[ScatteringRunType]: +) -> ConfiguredReducibleData[ScatteringRunType]: """Apply user offsets to raw data. Parameters @@ -47,7 +47,7 @@ def apply_component_user_offsets_to_raw_data( ) pos = data.coords['position'] data.coords['position'] = pos + detector_bank_offset.to(unit=pos.unit, copy=False) - return ConfiguredReducibleDataData[ScatteringRunType](data) + return ConfiguredReducibleData[ScatteringRunType](data) def apply_component_user_offsets_to_raw_monitor( diff --git a/src/ess/isissans/general.py b/src/ess/isissans/general.py index 0b892103..d986f097 100644 --- a/src/ess/isissans/general.py +++ b/src/ess/isissans/general.py @@ -6,7 +6,7 @@ import scipp as sc from ..sans.types import ( - ConfiguredReducibleDataData, + ConfiguredReducibleData, ConfiguredReducibleMonitor, CorrectForGravity, DetectorPixelShape, @@ -56,7 +56,7 @@ def get_monitor_data( def data_to_tof( - da: ConfiguredReducibleDataData[ScatteringRunType], + da: ConfiguredReducibleData[ScatteringRunType], ) -> TofData[ScatteringRunType]: """Dummy conversion of data to time-of-flight data. The data already has a time-of-flight coordinate.""" diff --git a/src/ess/loki/general.py b/src/ess/loki/general.py index 270f7b92..bf6b14d3 100644 --- a/src/ess/loki/general.py +++ b/src/ess/loki/general.py @@ -13,7 +13,7 @@ from ..sans.common import gravity_vector from ..sans.types import ( - ConfiguredReducibleDataData, + ConfiguredReducibleData, ConfiguredReducibleMonitor, CorrectForGravity, DetectorPixelShape, @@ -139,8 +139,8 @@ def patch_detector_data( detector_data: RawData[ScatteringRunType], source_position: SourcePosition[ScatteringRunType], sample_position: SamplePosition[ScatteringRunType], -) -> ConfiguredReducibleDataData[ScatteringRunType]: - return ConfiguredReducibleDataData[ScatteringRunType]( +) -> ConfiguredReducibleData[ScatteringRunType]: + return ConfiguredReducibleData[ScatteringRunType]( _add_variances_and_coordinates( da=detector_data, source_position=source_position, @@ -166,7 +166,7 @@ def _convert_to_tof(da: sc.DataArray) -> sc.DataArray: def data_to_tof( - da: ConfiguredReducibleDataData[ScatteringRunType], + da: ConfiguredReducibleData[ScatteringRunType], ) -> TofData[ScatteringRunType]: return TofData[ScatteringRunType](_convert_to_tof(da)) diff --git a/src/ess/sans/types.py b/src/ess/sans/types.py index 6e63edf1..c14d728d 100644 --- a/src/ess/sans/types.py +++ b/src/ess/sans/types.py @@ -230,7 +230,7 @@ class RawData(sciline.Scope[ScatteringRunType, sc.DataArray], sc.DataArray): """Raw detector data""" -class ConfiguredReducibleDataData( +class ConfiguredReducibleData( sciline.Scope[ScatteringRunType, sc.DataArray], sc.DataArray ): """Raw event data where variances and necessary coordinates