Skip to content
Snippets Groups Projects
Commit ae173414 authored by Conor Finn's avatar Conor Finn
Browse files

RE #27189 Make Flake8 fixes

parent 91e84a16
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,6 @@ from mantid.api import AnalysisDataService as Ads ...@@ -15,7 +15,6 @@ from mantid.api import AnalysisDataService as Ads
from mantid.kernel import logger from mantid.kernel import logger
from mantid.simpleapi import Load, EnggCalibrate, DeleteWorkspace, CloneWorkspace, \ from mantid.simpleapi import Load, EnggCalibrate, DeleteWorkspace, CloneWorkspace, \
CreateWorkspace, AppendSpectra, CreateEmptyTableWorkspace CreateWorkspace, AppendSpectra, CreateEmptyTableWorkspace
from mantidqt.plotting.functions import plot
from Engineering.EnggUtils import write_ENGINX_GSAS_iparam_file 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 vanadium_corrections
from Engineering.gui.engineering_diffraction.tabs.common import path_handling from Engineering.gui.engineering_diffraction.tabs.common import path_handling
......
...@@ -8,4 +8,4 @@ INSTRUMENT_DICT = {0: "ENGINX", 1: "IMAT"} ...@@ -8,4 +8,4 @@ INSTRUMENT_DICT = {0: "ENGINX", 1: "IMAT"}
def create_error_message(parent, message): def create_error_message(parent, message):
QMessageBox.warning(parent, "Engineering Diffraction - Error", str(message)) QMessageBox.warning(parent, "Engineering Diffraction - Error", str(message))
\ No newline at end of file
...@@ -44,4 +44,3 @@ class CalibrationInfo(object): ...@@ -44,4 +44,3 @@ class CalibrationInfo(object):
def is_valid(self): def is_valid(self):
return True if self.vanadium_path and self.sample_path and self.instrument else False return True if self.vanadium_path and self.sample_path and self.instrument else False
...@@ -13,7 +13,6 @@ import matplotlib.pyplot as plt ...@@ -13,7 +13,6 @@ import matplotlib.pyplot as plt
from Engineering.gui.engineering_diffraction.tabs.common import vanadium_corrections, path_handling 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 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" SAMPLE_RUN_WORKSPACE_NAME = "engggui_focusing_input_ws"
FOCUSED_OUTPUT_WORKSPACE_NAME = "engggui_focusing_output_ws_bank_" FOCUSED_OUTPUT_WORKSPACE_NAME = "engggui_focusing_output_ws_bank_"
......
...@@ -9,7 +9,6 @@ from __future__ import (absolute_import, division, print_function) ...@@ -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 import INSTRUMENT_DICT, create_error_message
from Engineering.gui.engineering_diffraction.tabs.common.calibration_info import CalibrationInfo 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.asynchronous import AsyncTask
from mantidqt.utils.observer_pattern import Observer from mantidqt.utils.observer_pattern import Observer
from mantid.simpleapi import logger from mantid.simpleapi import logger
......
...@@ -32,13 +32,6 @@ class FocusModelTest(unittest.TestCase): ...@@ -32,13 +32,6 @@ class FocusModelTest(unittest.TestCase):
self.model.focus_run("307593", ["1", "2"], False, "ENGINX", "0") self.model.focus_run("307593", ["1", "2"], False, "ENGINX", "0")
self.assertEqual(load.call_count, 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 + ".Ads")
@patch(file_path + ".FocusModel._save_output") @patch(file_path + ".FocusModel._save_output")
@patch(file_path + ".FocusModel._run_focus") @patch(file_path + ".FocusModel._run_focus")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment