diff --git a/scripts/Engineering/gui/engineering_diffraction/engineering_diffraction.py b/scripts/Engineering/gui/engineering_diffraction/engineering_diffraction.py
index 749c42455041ee24d1edfdda062260109d702f7e..3a8dbe99906095ffb77409dd2f222c700fb35310 100644
--- a/scripts/Engineering/gui/engineering_diffraction/engineering_diffraction.py
+++ b/scripts/Engineering/gui/engineering_diffraction/engineering_diffraction.py
@@ -61,7 +61,8 @@ class EngineeringDiffractionGui(QtWidgets.QMainWindow, Ui_main_window):
self.tabs.addTab(focus_view, "Focus")
def setup_calibration_notifier(self):
- self.calibration_presenter.calibration_notifier.add_subscriber(self.focus_presenter.calibration_observer)
+ self.calibration_presenter.calibration_notifier.add_subscriber(
+ self.focus_presenter.calibration_observer)
def set_on_help_clicked(self, slot):
self.pushButton_help.clicked.connect(slot)
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
index ae703fd3a142df1e47c183f897dcf8e292d130f6..3c9d9d67968e0b6230d61575d45a2243c6e5d775 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
@@ -121,10 +121,16 @@ class CalibrationPresenterTest(unittest.TestCase):
@patch(tab_path + ".presenter.CalibrationPresenter.emit_update_fields_signal")
def test_set_current_calibration(self, update_sig):
self.presenter.calibration_notifier = MagicMock()
- pending = CalibrationInfo(vanadium_path="/test/set/path", sample_path="test/set/path/2", instrument="TEST_INS")
- pendcpy = CalibrationInfo(vanadium_path="/test/set/path", sample_path="test/set/path/2", instrument="TEST_INS")
+ pending = CalibrationInfo(vanadium_path="/test/set/path",
+ sample_path="test/set/path/2",
+ instrument="TEST_INS")
+ pendcpy = CalibrationInfo(vanadium_path="/test/set/path",
+ sample_path="test/set/path/2",
+ instrument="TEST_INS")
self.presenter.pending_calibration = pending
- current = CalibrationInfo(vanadium_path="old/value", sample_path="old/cera", instrument="ENGINX")
+ current = CalibrationInfo(vanadium_path="old/value",
+ sample_path="old/cera",
+ instrument="ENGINX")
blank = CalibrationInfo()
self.presenter.current_calibration = current
@@ -145,7 +151,9 @@ class CalibrationPresenterTest(unittest.TestCase):
path.return_value = True
instrument, van, cer = ("test_ins", "test_van", "test_cer")
self.model.load_existing_gsas_parameters.return_value = instrument, van, cer
- current = CalibrationInfo(vanadium_path="old/value", sample_path="old/cera", instrument="ENGINX")
+ current = CalibrationInfo(vanadium_path="old/value",
+ sample_path="old/cera",
+ instrument="ENGINX")
new = CalibrationInfo(vanadium_path=van, sample_path=cer, instrument=instrument)
self.presenter.current_calibration = current
@@ -163,7 +171,9 @@ class CalibrationPresenterTest(unittest.TestCase):
self.view.get_new_checked.return_value = False
self.view.get_load_checked.return_value = True
path.return_value = False
- current = CalibrationInfo(vanadium_path="old/value", sample_path="old/cera", instrument="ENGINX")
+ current = CalibrationInfo(vanadium_path="old/value",
+ sample_path="old/cera",
+ instrument="ENGINX")
self.presenter.current_calibration = current
self.presenter.on_calibrate_clicked()
@@ -214,7 +224,9 @@ class CalibrationPresenterTest(unittest.TestCase):
instrument, van, cer = ("test_ins", "test_van", "test_cer")
old_pending = CalibrationInfo(vanadium_path=None, sample_path=None, instrument=None)
self.presenter.pending_calibration = old_pending
- expected_pending = CalibrationInfo(vanadium_path=van, sample_path=cer, instrument=instrument)
+ expected_pending = CalibrationInfo(vanadium_path=van,
+ sample_path=cer,
+ instrument=instrument)
self.presenter.instrument = instrument
self.presenter.start_calibration_worker(van, cer, False, None)
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py
index 656876e13cfa6d380dfeac46481e852876cfc674..9b67f260aba5d3b9110b2f22c71bc8c6509d1b0a 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py
@@ -75,7 +75,9 @@ class FocusModel(object):
def _plot_focused_workspaces(focused_workspaces):
fig = plt.figure()
gs = gridspec.GridSpec(1, len(focused_workspaces))
- plots = [fig.add_subplot(gs[i], projection="mantid") for i in range(len(focused_workspaces))]
+ plots = [
+ fig.add_subplot(gs[i], projection="mantid") for i in range(len(focused_workspaces))
+ ]
for ax, ws_name in zip(plots, focused_workspaces):
ax.plot(Ads.retrieve(ws_name), wkspIndex=0)
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 58ed7d4d229e8b5546b88a62d406efcf7c045866..53b8456052a5e0b8d271ec15a95631b49e75e377 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
@@ -44,8 +44,8 @@ class FocusModelTest(unittest.TestCase):
self.model.focus_run("305761", banks, False, "ENGINX", "0")
self.assertEqual(len(banks), run_focus.call_count)
run_focus.assert_called_with("mocked_sample",
- model.FOCUSED_OUTPUT_WORKSPACE_NAME + banks[-1],
- "test_wsp", "test_wsp", banks[-1])
+ model.FOCUSED_OUTPUT_WORKSPACE_NAME + banks[-1], "test_wsp",
+ "test_wsp", banks[-1])
@patch(file_path + ".Ads")
@patch(file_path + ".FocusModel._save_output")
@@ -53,7 +53,8 @@ class FocusModelTest(unittest.TestCase):
@patch(file_path + ".FocusModel._run_focus")
@patch(file_path + ".FocusModel._load_focus_sample_run")
@patch(file_path + ".vanadium_corrections.fetch_correction_workspaces")
- def test_focus_plotted_when_checked(self, fetch_van, load_focus, run_focus, plot_focus, output, ads):
+ def test_focus_plotted_when_checked(self, fetch_van, load_focus, run_focus, plot_focus, output,
+ ads):
ads.doesExist.return_value = True
fetch_van.return_value = ("mocked_integ", "mocked_curves")
banks = ["1", "2"]
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
index 2d4c9df683bf9006f2e8b060135ac650c37b7bb5..f6e64c7bfb5e6eb22baee97784dd3387d5d72203 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
@@ -111,7 +111,8 @@ class FocusPresenterTest(unittest.TestCase):
self.presenter._validate(banks)
create_error.assert_called_with(
- self.presenter.view, "Create or Load a calibration via the Calibration tab before focusing.")
+ self.presenter.view,
+ "Create or Load a calibration via the Calibration tab before focusing.")
@patch(tab_path + ".presenter.check_workspaces_exist")
@patch(tab_path + ".presenter.create_error_message")