diff --git a/src/ess/sans/types.py b/src/ess/sans/types.py index 4d80ea09..b3c14c2c 100644 --- a/src/ess/sans/types.py +++ b/src/ess/sans/types.py @@ -178,9 +178,7 @@ class TofData(sciline.Scope[ScatteringRunType, sc.DataArray], sc.DataArray): """Data with a time-of-flight coordinate""" -class TofMonitor( - sciline.ScopeTwoParams[RunType, MonitorType, sc.DataGroup], sc.DataGroup -): +class TofMonitor(sciline.Scope[RunType, MonitorType, sc.DataGroup], sc.DataGroup): """Monitor data with a time-of-flight coordinate""" @@ -196,7 +194,7 @@ class MonitorTerm(sciline.Scope[ScatteringRunType, sc.DataArray], sc.DataArray): class CleanWavelength( - sciline.ScopeTwoParams[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray + sciline.Scope[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray ): """ Prerequisite for IofQ numerator or denominator. @@ -208,50 +206,44 @@ class CleanWavelength( class WavelengthScaledQ( - sciline.ScopeTwoParams[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray + sciline.Scope[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray ): """Result of applying wavelength scaling/masking to :py:class:`CleanSummedQ`""" class WavelengthScaledQxy( - sciline.ScopeTwoParams[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray + sciline.Scope[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray ): """Result of applying wavelength scaling/masking to :py:class:`CleanSummedQxy`""" -class CleanQ( - sciline.ScopeTwoParams[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray -): +class CleanQ(sciline.Scope[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray): """Result of converting :py:class:`CleanWavelengthMasked` to Q""" -class CleanQxy( - sciline.ScopeTwoParams[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray -): +class CleanQxy(sciline.Scope[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray): """Result of converting :py:class:`CleanWavelengthMasked` to Qx and Qy""" class CleanSummedQ( - sciline.ScopeTwoParams[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray + sciline.Scope[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray ): """Result of histogramming/binning :py:class:`CleanQ` over all pixels into Q bins""" class CleanSummedQxy( - sciline.ScopeTwoParams[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray + sciline.Scope[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray ): """Result of histogramming/binning :py:class:`CleanQxy` over all pixels into Qx and Qy bins""" -class ReducedQ( - sciline.ScopeTwoParams[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray -): +class ReducedQ(sciline.Scope[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray): """Result of reducing :py:class:`CleanSummedQ` over the wavelength dimensions""" class ReducedQxy( - sciline.ScopeTwoParams[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray + sciline.Scope[ScatteringRunType, IofQPart, sc.DataArray], sc.DataArray ): """Result of reducing :py:class:`CleanSummedQxy` over the wavelength dimensions""" @@ -272,14 +264,12 @@ class IofQxy(sciline.Scope[ScatteringRunType, sc.DataArray], sc.DataArray): class WavelengthMonitor( - sciline.ScopeTwoParams[RunType, MonitorType, sc.DataArray], sc.DataArray + sciline.Scope[RunType, MonitorType, sc.DataArray], sc.DataArray ): """Monitor data converted to wavelength""" -class CleanMonitor( - sciline.ScopeTwoParams[RunType, MonitorType, sc.DataArray], sc.DataArray -): +class CleanMonitor(sciline.Scope[RunType, MonitorType, sc.DataArray], sc.DataArray): """Monitor data cleaned of background counts"""