Update import locations

Author: SimonHeybrock

src/ess/dream/io/geant4.py

@@ -17,7 +17,7 @@
     NeXusSource,
     RunType,
 )
-from ess.reduce.nexus.generic_workflow import GenericNeXusWorkflow
+from ess.reduce.nexus.workflow import GenericNeXusWorkflow
 
 MANTLE_DETECTOR_ID = sc.index(7)
 HIGH_RES_DETECTOR_ID = sc.index(8)

src/ess/dream/io/nexus.py

@@ -15,8 +15,8 @@
 
 import sciline
 
-from ess.reduce.nexus.generic_workflow import GenericNeXusWorkflow
 from ess.reduce.nexus.types import DetectorBankSizes
+from ess.reduce.nexus.workflow import GenericNeXusWorkflow
 
 DETECTOR_BANK_SIZES = {
     "endcap_backward_detector": {

src/ess/powder/types.py

@@ -14,32 +14,31 @@
 import scipp as sc
 from scippneutron.io import cif
 
-from ess.reduce.nexus import generic_types as reduce_gt
 from ess.reduce.nexus import types as reduce_t
 from ess.reduce.uncertainty import UncertaintyBroadcastMode as _UncertaintyBroadcastMode
 
 # 1 TypeVars used to parametrize the generic parts of the workflow
 
-BackgroundRun = reduce_gt.BackgroundRun
-CalibratedDetector = reduce_gt.CalibratedDetector
-CalibratedMonitor = reduce_gt.CalibratedMonitor
-DetectorData = reduce_gt.DetectorData
-DetectorPositionOffset = reduce_gt.DetectorPositionOffset
-EmptyBeamRun = reduce_gt.EmptyBeamRun
-Filename = reduce_gt.Filename
-MonitorData = reduce_gt.MonitorData
-MonitorPositionOffset = reduce_gt.MonitorPositionOffset
-MonitorType = reduce_gt.MonitorType
-NeXusMonitorName = reduce_gt.NeXusMonitorName
-NeXusDetector = reduce_gt.NeXusDetector
-NeXusMonitor = reduce_gt.NeXusMonitor
-NeXusSample = reduce_gt.NeXusSample
-NeXusSource = reduce_gt.NeXusSource
-RunType = reduce_gt.RunType
-SampleRun = reduce_gt.SampleRun
-SamplePosition = reduce_gt.SamplePosition
-SourcePosition = reduce_gt.SourcePosition
-VanadiumRun = reduce_gt.VanadiumRun
+BackgroundRun = reduce_t.BackgroundRun
+CalibratedDetector = reduce_t.CalibratedDetector
+CalibratedMonitor = reduce_t.CalibratedMonitor
+DetectorData = reduce_t.DetectorData
+DetectorPositionOffset = reduce_t.DetectorPositionOffset
+EmptyBeamRun = reduce_t.EmptyBeamRun
+Filename = reduce_t.Filename
+MonitorData = reduce_t.MonitorData
+MonitorPositionOffset = reduce_t.MonitorPositionOffset
+MonitorType = reduce_t.MonitorType
+NeXusMonitorName = reduce_t.NeXusMonitorName
+NeXusDetector = reduce_t.NeXusDetector
+NeXusMonitor = reduce_t.NeXusMonitor
+NeXusSample = reduce_t.NeXusSample
+NeXusSource = reduce_t.NeXusSource
+RunType = reduce_t.RunType
+SampleRun = reduce_t.SampleRun
+SamplePosition = reduce_t.SamplePosition
+SourcePosition = reduce_t.SourcePosition
+VanadiumRun = reduce_t.VanadiumRun
 
 DetectorBankSizes = reduce_t.DetectorBankSizes
 NeXusDetectorName = reduce_t.NeXusDetectorName

tests/dream/io/nexus_test.py

@@ -6,16 +6,16 @@
 
 import ess.dream.data  # noqa: F401
 from ess import dream
-from ess.reduce.nexus.generic_types import (
+from ess.reduce.nexus.types import (
     CalibratedDetector,
     CalibratedMonitor,
     DetectorData,
     Filename,
     Monitor1,
+    NeXusDetectorName,
     NeXusMonitorName,
     SampleRun,
 )
-from ess.reduce.nexus.types import NeXusDetectorName
 
 bank_dims = {'wire', 'module', 'segment', 'strip', 'counter'}
 hr_sans_dims = {'strip', 'other'}