Remove double-stacked modules

There's not really any point in having SANS.sans everywhere.

RE mantidproject#37952

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinder.py

@@ -18,11 +18,11 @@
 from sans.algorithm_detail.crop_helper import get_component_name
 from sans.algorithm_detail.single_execution import perform_can_subtraction
 from sans.algorithm_detail.strip_end_nans_and_infs import strip_end_nans
-from SANS.sans.common.constants import EMPTY_NAME
-from SANS.sans.common.enums import DetectorType, MaskingQuadrant, FindDirectionEnum
-from SANS.sans.common.file_information import get_instrument_paths_for_sans_file
-from SANS.sans.common.general_functions import create_child_algorithm
-from SANS.sans.common.xml_parsing import get_named_elements_from_ipf_file
+from sans.common.constants import EMPTY_NAME
+from sans.common.enums import DetectorType, MaskingQuadrant, FindDirectionEnum
+from sans.common.file_information import get_instrument_paths_for_sans_file
+from sans.common.general_functions import create_child_algorithm
+from sans.common.xml_parsing import get_named_elements_from_ipf_file
 from sans.state.Serializer import Serializer
 
 

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderCore.py

@@ -20,9 +20,9 @@
 from sans.algorithm_detail.scale_sans_workspace import scale_workspace
 from sans.algorithm_detail.slice_sans_event import slice_sans_event
 from sans.algorithm_detail.xml_shapes import quadrant_xml
-from SANS.sans.common.constants import EMPTY_NAME
-from SANS.sans.common.enums import DetectorType, DataType, MaskingQuadrant, RebinType
-from SANS.sans.common.general_functions import create_child_algorithm, append_to_sans_file_tag
+from sans.common.constants import EMPTY_NAME
+from sans.common.enums import DetectorType, DataType, MaskingQuadrant, RebinType
+from sans.common.general_functions import create_child_algorithm, append_to_sans_file_tag
 from sans.state.AllStates import AllStates
 from sans.state.Serializer import Serializer
 

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderMassMethod.py

@@ -17,9 +17,9 @@
 from sans.algorithm_detail.move_sans_instrument_component import move_component, MoveTypes
 from sans.algorithm_detail.scale_sans_workspace import scale_workspace
 from sans.algorithm_detail.slice_sans_event import slice_sans_event
-from SANS.sans.common.constants import EMPTY_NAME
-from SANS.sans.common.enums import DetectorType
-from SANS.sans.common.general_functions import create_child_algorithm, append_to_sans_file_tag
+from sans.common.constants import EMPTY_NAME
+from sans.common.enums import DetectorType
+from sans.common.general_functions import create_child_algorithm, append_to_sans_file_tag
 from sans.state.Serializer import Serializer
 
 

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSConvertToWavelengthAndRebin.py

@@ -23,9 +23,9 @@
 )
 from mantid.dataobjects import EventWorkspace
 from mantid.kernel import Direction, StringListValidator, Property
-from SANS.sans.common.constants import EMPTY_NAME
-from SANS.sans.common.enums import RebinType, RangeStepType
-from SANS.sans.common.general_functions import (
+from sans.common.constants import EMPTY_NAME
+from sans.common.enums import RebinType, RangeStepType
+from sans.common.general_functions import (
     create_unmanaged_algorithm,
     append_to_sans_file_tag,
     get_input_workspace_as_copy_if_not_same_as_output_workspace,

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSLoad.py

@@ -12,7 +12,7 @@
 from mantid.kernel import Direction, FloatArrayProperty
 from sans.algorithm_detail.load_data import SANSLoadDataFactory
 from sans.algorithm_detail.move_sans_instrument_component import move_component, MoveTypes
-from SANS.sans.common.enums import SANSDataType
+from sans.common.enums import SANSDataType
 
 from sans.state.Serializer import Serializer
 

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCore.py

@@ -12,7 +12,7 @@
 
 from mantid.api import AlgorithmFactory, Progress
 from sans.algorithm_detail.mask_workspace import mask_bins
-from SANS.sans.common.enums import DetectorType
+from sans.common.enums import DetectorType
 
 
 class SANSReductionCore(SANSReductionCoreBase):

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreBase.py

@@ -30,9 +30,9 @@
 from sans.algorithm_detail.move_sans_instrument_component import move_component, MoveTypes
 from sans.algorithm_detail.scale_sans_workspace import scale_workspace
 from sans.algorithm_detail.slice_sans_event import slice_sans_event
-from SANS.sans.common.constants import EMPTY_NAME
-from SANS.sans.common.enums import DetectorType, DataType, RebinType
-from SANS.sans.common.general_functions import create_child_algorithm, append_to_sans_file_tag
+from sans.common.constants import EMPTY_NAME
+from sans.common.enums import DetectorType, DataType, RebinType
+from sans.common.general_functions import create_child_algorithm, append_to_sans_file_tag
 from sans.state.Serializer import Serializer
 from sans.state.StateObjects.wavelength_interval import WavRange
 

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCoreEventSlice.py

@@ -13,7 +13,7 @@
 
 from mantid.api import MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode, Progress
 from mantid.kernel import Direction, StringListValidator
-from SANS.sans.common.enums import DetectorType, DataType
+from sans.common.enums import DetectorType, DataType
 
 
 class SANSReductionCoreEventSlice(SANSReductionCoreBase):

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSReductionCorePreprocess.py

@@ -14,7 +14,7 @@
 from mantid.api import MatrixWorkspaceProperty, AlgorithmFactory, Progress
 from mantid.kernel import Direction
 from sans.algorithm_detail.mask_workspace import mask_bins
-from SANS.sans.common.enums import DetectorType
+from sans.common.enums import DetectorType
 
 
 class SANSReductionCorePreprocess(SANSReductionCoreBase):

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSave.py

@@ -11,10 +11,10 @@
 from mantid.api import DataProcessorAlgorithm, MatrixWorkspaceProperty, AlgorithmFactory, PropertyMode, FileProperty, FileAction, Progress
 from mantid.kernel import Direction, logger
 from sans.algorithm_detail.save_workspace import save_to_file, get_zero_error_free_workspace, file_format_with_append
-from SANS.sans.common.file_information import convert_to_shape
-from SANS.sans.common.general_functions import get_detector_names_from_instrument
-from SANS.sans.common.constant_containers import SANSInstrument_string_as_key_NoInstrument
-from SANS.sans.common.enums import SaveType
+from sans.common.file_information import convert_to_shape
+from sans.common.general_functions import get_detector_names_from_instrument
+from sans.common.constant_containers import SANSInstrument_string_as_key_NoInstrument
+from sans.common.enums import SaveType
 
 
 class SANSSave(DataProcessorAlgorithm):

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction.py

@@ -14,8 +14,8 @@
 from mantid.kernel import Direction, Property
 from mantid.simpleapi import CloneWorkspace
 from sans.algorithm_detail.single_execution import run_core_reduction, run_optimized_for_can
-from SANS.sans.common.enums import DataType, ReductionMode
-from SANS.sans.common.general_functions import does_can_workspace_exist_on_ads
+from sans.common.enums import DataType, ReductionMode
+from sans.common.general_functions import does_can_workspace_exist_on_ads
 from sans.data_objects.sans_workflow_algorithm_outputs import SANSWorkflowAlgorithmOutputs
 
 

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReduction2.py

@@ -22,8 +22,8 @@
     get_reduction_mode_vs_output_bundles,
     run_optimized_for_can,
 )
-from SANS.sans.common.enums import DataType, ReductionMode, FitType
-from SANS.sans.common.general_functions import (
+from sans.common.enums import DataType, ReductionMode, FitType
+from sans.common.general_functions import (
     create_child_algorithm,
     does_can_workspace_exist_on_ads,
     get_transmission_output_name,

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSingleReductionBase.py

@@ -13,8 +13,8 @@
 from sans.algorithm_detail.bundles import ReductionSettingBundle, CompletedSlices
 from sans.algorithm_detail.single_execution import get_final_output_workspaces, get_merge_bundle_for_merge_request
 from sans.algorithm_detail.strip_end_nans_and_infs import strip_end_nans
-from SANS.sans.common.enums import DataType, ReductionMode
-from SANS.sans.common.general_functions import create_child_algorithm
+from sans.common.enums import DataType, ReductionMode
+from sans.common.general_functions import create_child_algorithm
 from sans.data_objects.sans_workflow_algorithm_outputs import SANSWorkflowAlgorithmOutputs
 from sans.state.Serializer import Serializer
 

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSStitch.py

@@ -10,8 +10,8 @@
 from mantid.api import DataProcessorAlgorithm, MatrixWorkspaceProperty, PropertyMode
 from mantid.kernel import Direction, Property, StringListValidator, UnitFactory, EnabledWhenProperty, PropertyCriterion, Logger
 import numpy as np
-from SANS.sans.common.general_functions import create_unmanaged_algorithm
-from SANS.sans.common.constants import EMPTY_NAME
+from sans.common.general_functions import create_unmanaged_algorithm
+from sans.common.constants import EMPTY_NAME
 
 
 class Mode(object):

Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/sans/SANSConvertToWavelengthAndRebinTest.py

@@ -11,9 +11,9 @@
 
 from mantid.api import FrameworkManager, WorkspaceGroup
 from mantid.dataobjects import EventWorkspace
-from SANS.sans.common.general_functions import create_unmanaged_algorithm
-from SANS.sans.common.constants import EMPTY_NAME
-from SANS.sans.common.enums import RangeStepType
+from sans.common.general_functions import create_unmanaged_algorithm
+from sans.common.constants import EMPTY_NAME
+from sans.common.enums import RangeStepType
 
 
 def provide_workspace(is_event=True):

Testing/SystemTests/tests/framework/ISIS/SANS/LARMOR/SANSLARMORMultiPeriod.py

@@ -12,7 +12,7 @@
 from mantid.api import AnalysisDataService
 from ISISCommandInterface import *
 from SANSBatchMode import *
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.LARMOR)

Testing/SystemTests/tests/framework/ISIS/SANS/LARMOR/SANSLARMORMultiPeriodAddFiles.py

@@ -10,7 +10,7 @@
 from mantid.simpleapi import DeleteWorkspace
 
 from ISISCommandInterface import *
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.LARMOR)

Testing/SystemTests/tests/framework/ISIS/SANS/LARMOR/SANSLARMORMultiPeriodAddFilesTest_V2.py

@@ -24,7 +24,7 @@
     AddRuns,
     LARMOR,
 )
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.LARMOR)

Testing/SystemTests/tests/framework/ISIS/SANS/LARMOR/SANSLARMORMultiPeriod_V2.py

@@ -13,7 +13,7 @@
 from sans.command_interface.ISISCommandInterface import Set1D, Detector, MaskFile, AssignSample, WavRangeReduction, LARMOR
 
 # test batch mode with sans2d and selecting a period in batch mode
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.LARMOR)

Testing/SystemTests/tests/framework/ISIS/SANS/LARMOR/SANSLARMOR_multiperiod_event_files_TOML.py

@@ -23,7 +23,7 @@
     AddRuns,
     LARMOR,
 )
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.LARMOR)

Testing/SystemTests/tests/framework/ISIS/SANS/LOQ/LOQReloadWorkspaces.py

@@ -11,7 +11,7 @@
 from mantid.simpleapi import LoadRaw, MoveInstrumentComponent
 import unittest
 
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 """
 Allowing the reduction to use already loaded workspace will make it easier to

Testing/SystemTests/tests/framework/ISIS/SANS/LOQ/SANSLOQAddBatch.py

@@ -16,7 +16,7 @@
 
 import os
 
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.LOQ)

Testing/SystemTests/tests/framework/ISIS/SANS/LOQ/SANSLOQBatch.py

@@ -14,7 +14,7 @@
 from SANSBatchMode import *
 import os.path
 
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.LOQ)

Testing/SystemTests/tests/framework/ISIS/SANS/LOQ/SANSLOQBatch_V2.py

@@ -14,7 +14,7 @@
 from mantid.api import FileFinder
 from mantid.simpleapi import LoadNexus, Plus
 from sans.command_interface.ISISCommandInterface import LOQ, Detector, Set1D, MaskFile, Gravity, BatchReduce, UseCompatibilityMode
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.LOQ)

Testing/SystemTests/tests/framework/ISIS/SANS/LOQ/SANSLOQCan2D.py

@@ -12,7 +12,7 @@
 from ISISCommandInterface import *
 
 # Test is giving odd results on Linux, but only this 2D one.
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.LOQ)

Testing/SystemTests/tests/framework/ISIS/SANS/LOQ/SANSLOQCan2D_TOML.py

@@ -19,7 +19,7 @@
     WavRangeReduction,
     UseCompatibilityMode,
 )
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.LOQ)

Testing/SystemTests/tests/framework/ISIS/SANS/LOQ/SANSLOQCan2D_V2.py

@@ -23,7 +23,7 @@
 )
 
 # Test is giving odd results on Linux, but only this 2D one.
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.LOQ)

Testing/SystemTests/tests/framework/ISIS/SANS/LOQ/SANSLOQCentreNoGrav.py

@@ -9,7 +9,7 @@
 from ISIS.SANS.isis_sans_system_test import ISISSansSystemTest
 from mantid.simpleapi import *
 from ISISCommandInterface import *
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.LOQ)

Testing/SystemTests/tests/framework/ISIS/SANS/LOQ/SANSLOQLegacyUserFile.py

@@ -6,7 +6,7 @@
 # SPDX - License - Identifier: GPL - 3.0 +
 import systemtesting
 from mantid import FileFinder
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 from ISIS.SANS.isis_sans_system_test import ISISSansSystemTest
 
 from sans.command_interface.ISISCommandInterface import LOQ, UseCompatibilityMode, BatchReduce

Testing/SystemTests/tests/framework/ISIS/SANS/LOQ/SANSLOQReductionGUI.py

@@ -10,7 +10,7 @@
 from ISIS.SANS.isis_sans_system_test import ISISSansSystemTest
 from mantid.simpleapi import *
 import ISISCommandInterface as i
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.LOQ)

Testing/SystemTests/tests/framework/ISIS/SANS/LOQ/SANSLOQReductionGUITest_V2.py

@@ -9,7 +9,7 @@
 from ISIS.SANS.isis_sans_system_test import ISISSansSystemTest
 from mantid.kernel import config
 from sans.command_interface.ISISCommandInterface import UseCompatibilityMode, LOQ, MaskFile, BatchReduce
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.LOQ)

Testing/SystemTests/tests/framework/ISIS/SANS/LOQ/SANSLOQTransFitWorkspace2D.py

@@ -10,7 +10,7 @@
 from ISIS.SANS.isis_sans_system_test import ISISSansSystemTest
 from mantid.simpleapi import *
 from ISISCommandInterface import *
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.LOQ)

Testing/SystemTests/tests/framework/ISIS/SANS/SANS2D/SANS2DBatch.py

@@ -15,7 +15,7 @@
 import os.path
 
 # test batch mode with sans2d and selecting a period in batch mode
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.SANS2D)

Testing/SystemTests/tests/framework/ISIS/SANS/SANS2D/SANS2DBatchTest_V2.py

@@ -24,7 +24,7 @@
 )
 import os.path
 
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.SANS2D)

Testing/SystemTests/tests/framework/ISIS/SANS/SANS2D/SANS2DFrontNoGrav.py

@@ -9,7 +9,7 @@
 import systemtesting
 from ISIS.SANS.isis_sans_system_test import ISISSansSystemTest
 from ISISCommandInterface import *
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.SANS2D)

Testing/SystemTests/tests/framework/ISIS/SANS/SANS2D/SANS2DFrontNoGrav_V2.py

@@ -18,7 +18,7 @@
     AssignSample,
     WavRangeReduction,
 )
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.SANS2D)

Testing/SystemTests/tests/framework/ISIS/SANS/SANS2D/SANS2DLimitEventsTime.py

@@ -10,7 +10,7 @@
 from ISIS.SANS.isis_sans_system_test import ISISSansSystemTest
 from mantid.simpleapi import *
 from ISISCommandInterface import *
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.SANS2D)

Testing/SystemTests/tests/framework/ISIS/SANS/SANS2D/SANS2DLimitEventsTime_V2.py

@@ -10,7 +10,7 @@
 import mantid  # noqa
 from ISIS.SANS.isis_sans_system_test import ISISSansSystemTest
 from sans.command_interface.ISISCommandInterface import SANS2D, MaskFile, AssignSample, WavRangeReduction, UseCompatibilityMode
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.SANS2D)

Testing/SystemTests/tests/framework/ISIS/SANS/SANS2D/SANS2DMultiPeriod.py

@@ -11,7 +11,7 @@
 from ISIS.SANS.isis_sans_system_test import ISISSansSystemTest
 from ISISCommandInterface import *
 from SANSBatchMode import *
-from SANS.sans.common.enums import SANSInstrument
+from sans.common.enums import SANSInstrument
 
 
 @ISISSansSystemTest(SANSInstrument.SANS2D)