diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py index 892f26fa6986b375125b42b6418fa5e2599f15f0..b49f4e89d74e100a7a32ad1fd58e796470b2e5d4 100644 --- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py +++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py @@ -15,7 +15,6 @@ from mantid.api import AnalysisDataService as Ads from mantid.kernel import logger from mantid.simpleapi import Load, EnggCalibrate, DeleteWorkspace, CloneWorkspace, \ CreateWorkspace, AppendSpectra, CreateEmptyTableWorkspace -from mantidqt.plotting.functions import plot from Engineering.EnggUtils import write_ENGINX_GSAS_iparam_file from Engineering.gui.engineering_diffraction.tabs.common import vanadium_corrections from Engineering.gui.engineering_diffraction.tabs.common import path_handling diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/__init__.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/__init__.py index 65df643d49746d3632294bf620b0a2ccaf811ede..de7c2f4de997b16bf8bc735621603badef51f4b5 100644 --- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/__init__.py +++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/__init__.py @@ -8,4 +8,4 @@ INSTRUMENT_DICT = {0: "ENGINX", 1: "IMAT"} def create_error_message(parent, message): - QMessageBox.warning(parent, "Engineering Diffraction - Error", str(message)) \ No newline at end of file + QMessageBox.warning(parent, "Engineering Diffraction - Error", str(message)) diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/calibration_info.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/calibration_info.py index ad6ff397241725a3a260cc4cdbdfee232d6bc26f..a803e2fdb487f5e0de468cd01943b673ed306567 100644 --- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/calibration_info.py +++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/calibration_info.py @@ -44,4 +44,3 @@ class CalibrationInfo(object): def is_valid(self): return True if self.vanadium_path and self.sample_path and self.instrument else False - diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py index 01476c7a6995f7ce4e8901721306bcbea6064da1..00ebd59d1e29f50d98ad5a4bddf02e943dbbd4d9 100644 --- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py +++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py @@ -13,7 +13,6 @@ import matplotlib.pyplot as plt from Engineering.gui.engineering_diffraction.tabs.common import vanadium_corrections, path_handling from mantid.simpleapi import EnggFocus, Load, logger, AnalysisDataService as Ads, SaveNexus, SaveGSS, SaveFocusedXYE -from mantidqt.plotting.functions import plot SAMPLE_RUN_WORKSPACE_NAME = "engggui_focusing_input_ws" FOCUSED_OUTPUT_WORKSPACE_NAME = "engggui_focusing_output_ws_bank_" diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py index 352bf81a512eb7a01559a448d721a2c53e9b494e..536446233cdb93c1306603017bf05ebaa61c7d04 100644 --- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py +++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py @@ -9,7 +9,6 @@ from __future__ import (absolute_import, division, print_function) from Engineering.gui.engineering_diffraction.tabs.common import INSTRUMENT_DICT, create_error_message from Engineering.gui.engineering_diffraction.tabs.common.calibration_info import CalibrationInfo -from Engineering.gui.engineering_diffraction.tabs.common.vanadium_corrections import check_workspaces_exist from mantidqt.utils.asynchronous import AsyncTask from mantidqt.utils.observer_pattern import Observer from mantid.simpleapi import logger diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_model.py index a9d3ac31391e00901e10ccb95dd05610cb6769c4..6dcb06a99481de67519cc33b87e961506779564c 100644 --- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_model.py +++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_model.py @@ -32,13 +32,6 @@ class FocusModelTest(unittest.TestCase): self.model.focus_run("307593", ["1", "2"], False, "ENGINX", "0") self.assertEqual(load.call_count, 0) - @patch(file_path + ".FocusModel._load_focus_sample_run") - @patch(file_path + ".vanadium_corrections.Ads.doesExist") - def test_focus_cancelled_if_van_wsp_missing(self, ads_exist, load): - ads_exist.return_value = False - self.model.focus_run("307593", ["1", "2"], False, "ENGINX", "0") - self.assertEqual(load.call_count, 0) - @patch(file_path + ".Ads") @patch(file_path + ".FocusModel._save_output") @patch(file_path + ".FocusModel._run_focus")