diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py
index a01131293b00cd8372cb0572872085add0967601..96a0bd3a8a3c456b82bab53722658dd148ea0a11 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/model.py
@@ -8,6 +8,8 @@
from __future__ import (absolute_import, division, print_function)
from os import path, makedirs
+from matplotlib import gridspec
+import matplotlib.pyplot as plt
from mantid.api import AnalysisDataService as Ads
from mantid.kernel import logger
@@ -53,7 +55,8 @@ class CalibrationModel(object):
for i in range(2):
difc = [output[i].DIFC]
tzero = [output[i].TZERO]
- self._plot_difc_zero(difc, tzero)
+ self._generate_difc_tzero_workspace(difc, tzero, i + 1)
+ self._plot_difc_tzero()
difc = [output[0].DIFC, output[1].DIFC]
tzero = [output[0].TZERO, output[1].TZERO]
@@ -110,58 +113,73 @@ class CalibrationModel(object):
DeleteWorkspace(van_curve_twin_ws)
CloneWorkspace(InputWorkspace="engggui_vanadium_curves", OutputWorkspace=van_curve_twin_ws)
van_curves_ws = Ads.retrieve(van_curve_twin_ws)
- for i in range(1, 3):
- if i == 1:
- curve_plot_bank_1 = plot([van_curves_ws], [0, 1, 2])
- curve_plot_bank_1.gca().set_title("Engg GUI Vanadium Curves Bank 1")
- curve_plot_bank_1.gca().legend(["Data", "Calc", "Diff"])
- if i == 2:
- curve_plot_bank_2 = plot([van_curves_ws], [3, 4, 5])
- curve_plot_bank_2.gca().set_title("Engg GUI Vanadium Curves Bank 2")
- curve_plot_bank_2.gca().legend(["Data", "Calc", "Diff"])
+
+ fig = plt.figure()
+ gs = gridspec.GridSpec(1, 2)
+ curve_plot_bank_1 = fig.add_subplot(gs[0], projection="mantid")
+ curve_plot_bank_2 = fig.add_subplot(gs[1], projection="mantid")
+
+ curve_plot_bank_1.plot(van_curves_ws, wkspIndex=0)
+ curve_plot_bank_1.plot(van_curves_ws, wkspIndex=1)
+ curve_plot_bank_1.plot(van_curves_ws, wkspIndex=2)
+ curve_plot_bank_1.set_title("Engg GUI Vanadium Curves Bank 1")
+ curve_plot_bank_1.legend(["Data", "Calc", "Diff"])
+
+ curve_plot_bank_2.plot(van_curves_ws, wkspIndex=3)
+ curve_plot_bank_2.plot(van_curves_ws, wkspIndex=4)
+ curve_plot_bank_2.plot(van_curves_ws, wkspIndex=5)
+ curve_plot_bank_2.set_title("Engg GUI Vanadium Curves Bank 2")
+ curve_plot_bank_2.legend(["Data", "Calc", "Diff"])
+
+ fig.show()
+
+ @staticmethod
+ def _generate_difc_tzero_workspace(difc, tzero, bank):
+ bank_ws = Ads.retrieve(CalibrationModel._generate_table_workspace_name(bank - 1))
+
+ x_val = []
+ y_val = []
+ y2_val = []
+
+ difc_to_plot = difc[0]
+ tzero_to_plot = tzero[0]
+
+ for irow in range(0, bank_ws.rowCount()):
+ x_val.append(bank_ws.cell(irow, 0))
+ y_val.append(bank_ws.cell(irow, 5))
+ y2_val.append(x_val[irow] * difc_to_plot + tzero_to_plot)
+
+ ws1 = CreateWorkspace(DataX=x_val,
+ DataY=y_val,
+ UnitX="Expected Peaks Centre (dSpacing A)",
+ YUnitLabel="Fitted Peaks Centre(TOF, us)")
+ ws2 = CreateWorkspace(DataX=x_val, DataY=y2_val)
+
+ output_ws = "engggui_difc_zero_peaks_bank_" + str(bank)
+ if Ads.doesExist(output_ws):
+ DeleteWorkspace(output_ws)
+
+ AppendSpectra(ws1, ws2, OutputWorkspace=output_ws)
+ DeleteWorkspace(ws1)
+ DeleteWorkspace(ws2)
@staticmethod
- def _plot_difc_zero(difc, tzero):
- for i in range(1, 3):
- bank_ws = Ads.retrieve(CalibrationModel._generate_table_workspace_name(i - 1))
-
- x_val = []
- y_val = []
- y2_val = []
-
- difc_to_plot = difc[0]
- tzero_to_plot = tzero[0]
-
- for irow in range(0, bank_ws.rowCount()):
- x_val.append(bank_ws.cell(irow, 0))
- y_val.append(bank_ws.cell(irow, 5))
- y2_val.append(x_val[irow] * difc_to_plot + tzero_to_plot)
-
- ws1 = CreateWorkspace(DataX=x_val,
- DataY=y_val,
- UnitX="Expected Peaks Centre (dSpacing A)",
- YUnitLabel="Fitted Peaks Centre(TOF, us)")
- ws2 = CreateWorkspace(DataX=x_val, DataY=y2_val)
-
- output_ws = "engggui_difc_zero_peaks_bank_" + str(i)
- if Ads.doesExist(output_ws):
- DeleteWorkspace(output_ws)
-
- AppendSpectra(ws1, ws2, OutputWorkspace=output_ws)
- DeleteWorkspace(ws1)
- DeleteWorkspace(ws2)
-
- difc_zero_ws = Ads.retrieve(output_ws)
- # Create plot
- difc_zero_plot = plot([difc_zero_ws], [0, 1],
- plot_kwargs={
- "linestyle": "--",
- "marker": "o",
- "markersize": "3"
- })
- difc_zero_plot.gca().set_title("Engg Gui Difc Zero Peaks Bank " + str(i))
- difc_zero_plot.gca().legend(("Peaks Fitted", "DifC/TZero Fitted Straight Line"))
- difc_zero_plot.gca().set_xlabel("Expected Peaks Centre(dSpacing, A)")
+ def _plot_difc_tzero():
+ bank_1_ws = Ads.retrieve("engggui_difc_zero_peaks_bank_1")
+ bank_2_ws = Ads.retrieve("engggui_difc_zero_peaks_bank_2")
+ # Create plot
+ fig = plt.figure()
+ gs = gridspec.GridSpec(1, 2)
+ plot_bank_1 = fig.add_subplot(gs[0], projection="mantid")
+ plot_bank_2 = fig.add_subplot(gs[1], projection="mantid")
+
+ for ax, ws, bank in zip([plot_bank_1, plot_bank_2], [bank_1_ws, bank_2_ws], [1, 2]):
+ ax.plot(ws, wkspIndex=0, linestyle="--", marker="o", markersize="3")
+ ax.plot(ws, wkspIndex=1, linestyle="--", marker="o", markersize="3")
+ ax.set_title("Engg Gui Difc Zero Peaks Bank " + str(bank))
+ ax.legend(("Peaks Fitted", "DifC/TZero Fitted Straight Line"))
+ ax.set_xlabel("Expected Peaks Centre(dSpacing, A)")
+ fig.show()
@staticmethod
def load_ceria(ceria_run_no):
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py
index 51ea0044c9015f45be6135c61157a6a5ee9bb5cd..f1b96dbcf615ee1647180aeefd7e6d5c59f8150c 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py
@@ -58,24 +58,27 @@ class CalibrationModelTest(unittest.TestCase):
@patch(class_path + '.load_ceria')
@patch(file_path + '.vanadium_corrections.fetch_correction_workspaces')
@patch(class_path + '._plot_vanadium_curves')
- @patch(class_path + '._plot_difc_zero')
+ @patch(class_path + '._generate_difc_tzero_workspace')
+ @patch(class_path + '._plot_difc_tzero')
@patch(class_path + '.run_calibration')
- def test_plotting_check(self, calib, plot_difc_zero, plot_van, van, ceria, output_files,
+ def test_plotting_check(self, calib, plot_difc_zero, gen_difc, plot_van, van, ceria, output_files,
update_table):
van.return_value = ("A", "B")
self.model.create_new_calibration(VANADIUM_NUMBER, CERIUM_NUMBER, False, "ENGINX")
plot_van.assert_not_called()
plot_difc_zero.assert_not_called()
+ gen_difc.assert_not_called()
self.model.create_new_calibration(VANADIUM_NUMBER, CERIUM_NUMBER, True, "ENGINX")
plot_van.assert_called_once()
- self.assertEqual(plot_difc_zero.call_count, 2)
+ self.assertEqual(gen_difc.call_count, 2)
+ self.assertEqual(plot_difc_zero.call_count, 1)
@patch(class_path + '.update_calibration_params_table')
@patch(class_path + '.create_output_files')
@patch(class_path + '.load_ceria')
@patch(file_path + '.vanadium_corrections.fetch_correction_workspaces')
@patch(class_path + '._plot_vanadium_curves')
- @patch(class_path + '._plot_difc_zero')
+ @patch(class_path + '._plot_difc_tzero')
@patch(class_path + '.run_calibration')
def test_present_RB_number_results_in_user_output_files(self, calib, plot_difc_zero, plot_van,
van, ceria, output_files, update_table):
@@ -92,7 +95,7 @@ class CalibrationModelTest(unittest.TestCase):
@patch(class_path + '.load_ceria')
@patch(file_path + '.vanadium_corrections.fetch_correction_workspaces')
@patch(class_path + '._plot_vanadium_curves')
- @patch(class_path + '._plot_difc_zero')
+ @patch(class_path + '._plot_difc_tzero')
@patch(class_path + '.run_calibration')
def test_absent_run_number_results_in_no_user_output_files(self, calib, plot_difc_zero,
plot_van, van, ceria, output_files,
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py
index f41d7f526c49caa343e28e55244d8f71298a8c47..01476c7a6995f7ce4e8901721306bcbea6064da1 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/model.py
@@ -8,9 +8,11 @@
from __future__ import (absolute_import, division, print_function)
from os import path
+from matplotlib import gridspec
+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
+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"
@@ -33,16 +35,17 @@ class FocusModel(object):
integration_workspace = Ads.retrieve(vanadium_corrections.INTEGRATED_WORKSPACE_NAME)
curves_workspace = Ads.retrieve(vanadium_corrections.CURVES_WORKSPACE_NAME)
sample_workspace = self._load_focus_sample_run(sample_path)
+ output_workspaces = []
for name in banks:
output_workspace_name = FOCUSED_OUTPUT_WORKSPACE_NAME + str(name)
self._run_focus(sample_workspace, output_workspace_name, integration_workspace,
curves_workspace, name)
- # Plot the output
- if plot_output:
- self._plot_focused_workspace(output_workspace_name)
+ output_workspaces.append(output_workspace_name)
# Save the output to the file system.
- self._save_focused_output_files_as_nexus(instrument, sample_path, name,
- output_workspace_name, rb_number)
+ self._save_output(instrument, sample_path, name, output_workspace_name, rb_number)
+ # Plot the output
+ if plot_output:
+ self._plot_focused_workspaces(output_workspaces)
@staticmethod
def _run_focus(input_workspace, output_workspace, vanadium_integration_ws, vanadium_curves_ws,
@@ -70,21 +73,47 @@ class FocusModel(object):
raise RuntimeError
@staticmethod
- def _plot_focused_workspace(focused):
- focused_wsp = Ads.retrieve(focused)
- plot([focused_wsp], wksp_indices=[0])
+ 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))]
- def _save_focused_output_files_as_nexus(self, instrument, sample_path, bank, sample_workspace,
- rb_number):
+ for ax, ws_name in zip(plots, focused_workspaces):
+ ax.plot(Ads.retrieve(ws_name), wkspIndex=0)
+ ax.set_title(ws_name)
+ fig.show()
+
+ def _save_output(self, instrument, sample_path, bank, sample_workspace, rb_number):
"""
- Save a focused workspace to the file system. Saves a separate copy to a User directory if an rb number has been
- set.
+ Save a focused workspace to the file system. Saves separate copies to a User directory if an rb number has
+ been set.
:param instrument: The instrument the data is from.
:param sample_path: The path to the data file that was focused.
:param bank: The name of the bank being saved.
:param sample_workspace: The name of the workspace to be saved.
:param rb_number: Usually an experiment id, defines the name of the user directory.
"""
+ self._save_focused_output_files_as_nexus(instrument, sample_path, bank, sample_workspace,
+ rb_number)
+ self._save_focused_output_files_as_gss(instrument, sample_path, bank, sample_workspace,
+ rb_number)
+ self._save_focused_output_files_as_xye(instrument, sample_path, bank, sample_workspace,
+ rb_number)
+
+ def _save_focused_output_files_as_gss(self, instrument, sample_path, bank, sample_workspace,
+ rb_number):
+ gss_output_path = path.join(
+ path_handling.OUT_FILES_ROOT_DIR, "Focus",
+ self._generate_output_file_name(instrument, sample_path, bank, ".gss"))
+ SaveGSS(InputWorkspace=sample_workspace, Filename=gss_output_path)
+ if rb_number is not None:
+ gss_output_path = path.join(
+ path_handling.OUT_FILES_ROOT_DIR, "User", rb_number, "Focus",
+ self._generate_output_file_name(instrument, sample_path, bank, ".gss"))
+ SaveGSS(InputWorkspace=sample_workspace, Filename=gss_output_path)
+
+ def _save_focused_output_files_as_nexus(self, instrument, sample_path, bank, sample_workspace,
+ rb_number):
nexus_output_path = path.join(
path_handling.OUT_FILES_ROOT_DIR, "Focus",
self._generate_output_file_name(instrument, sample_path, bank, ".nxs"))
@@ -95,6 +124,20 @@ class FocusModel(object):
self._generate_output_file_name(instrument, sample_path, bank, ".nxs"))
SaveNexus(InputWorkspace=sample_workspace, Filename=nexus_output_path)
+ def _save_focused_output_files_as_xye(self, instrument, sample_path, bank, sample_workspace,
+ rb_number):
+ xye_output_path = path.join(
+ path_handling.OUT_FILES_ROOT_DIR, "Focus",
+ self._generate_output_file_name(instrument, sample_path, bank, ".dat"))
+ SaveFocusedXYE(InputWorkspace=sample_workspace, Filename=xye_output_path, SplitFiles=False)
+ if rb_number is not None:
+ xye_output_path = path.join(
+ path_handling.OUT_FILES_ROOT_DIR, "User", rb_number, "Focus",
+ self._generate_output_file_name(instrument, sample_path, bank, ".dat"))
+ SaveFocusedXYE(InputWorkspace=sample_workspace,
+ Filename=xye_output_path,
+ SplitFiles=False)
+
@staticmethod
def _generate_output_file_name(instrument, sample_path, bank, suffix):
run_no = path_handling.get_run_number_from_path(sample_path, instrument)
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 ff406bb710deb2b7aed7f1098925ab93b4ec09dd..a9d3ac31391e00901e10ccb95dd05610cb6769c4 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
@@ -13,6 +13,7 @@ from os import path
from mantid.py3compat.mock import patch
from Engineering.gui.engineering_diffraction.tabs.focus import model
from Engineering.gui.engineering_diffraction.tabs.common import path_handling
+from Engineering.gui.engineering_diffraction.tabs.common.calibration_info import CalibrationInfo
file_path = "Engineering.gui.engineering_diffraction.tabs.focus.model"
@@ -20,10 +21,16 @@ file_path = "Engineering.gui.engineering_diffraction.tabs.focus.model"
class FocusModelTest(unittest.TestCase):
def setUp(self):
self.model = model.FocusModel()
- self.current_calibration = {
- "vanadium_path": "/mocked/out/anyway",
- "ceria_path": "this_is_mocked_out_too"
- }
+ self.current_calibration = CalibrationInfo(vanadium_path="/mocked/out/anyway",
+ sample_path="this_is_mocked_out_too",
+ instrument="ENGINX")
+
+ @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 + ".FocusModel._load_focus_sample_run")
@patch(file_path + ".vanadium_corrections.Ads.doesExist")
@@ -33,7 +40,7 @@ class FocusModelTest(unittest.TestCase):
self.assertEqual(load.call_count, 0)
@patch(file_path + ".Ads")
- @patch(file_path + ".FocusModel._save_focused_output_files_as_nexus")
+ @patch(file_path + ".FocusModel._save_output")
@patch(file_path + ".FocusModel._run_focus")
@patch(file_path + ".FocusModel._load_focus_sample_run")
def test_focus_run_for_each_bank(self, load_focus, run_focus, output, ads):
@@ -48,8 +55,8 @@ class FocusModelTest(unittest.TestCase):
"test_wsp", "test_wsp", banks[-1])
@patch(file_path + ".Ads")
- @patch(file_path + ".FocusModel._save_focused_output_files_as_nexus")
- @patch(file_path + ".FocusModel._plot_focused_workspace")
+ @patch(file_path + ".FocusModel._save_output")
+ @patch(file_path + ".FocusModel._plot_focused_workspaces")
@patch(file_path + ".FocusModel._run_focus")
@patch(file_path + ".FocusModel._load_focus_sample_run")
@patch(file_path + ".vanadium_corrections.fetch_correction_workspaces")
@@ -59,12 +66,12 @@ class FocusModelTest(unittest.TestCase):
banks = ["1", "2"]
load_focus.return_value = "mocked_sample"
- self.model.focus_run("305761", banks, True, "ENGINX", "0")
- self.assertEqual(len(banks), plot_focus.call_count)
+ self.model.focus_run("305761", banks, True, "ENGINX", "0", self.current_calibration)
+ self.assertEqual(1, plot_focus.call_count)
@patch(file_path + ".Ads")
- @patch(file_path + ".FocusModel._save_focused_output_files_as_nexus")
- @patch(file_path + ".FocusModel._plot_focused_workspace")
+ @patch(file_path + ".FocusModel._save_output")
+ @patch(file_path + ".FocusModel._plot_focused_workspaces")
@patch(file_path + ".FocusModel._run_focus")
@patch(file_path + ".FocusModel._load_focus_sample_run")
@patch(file_path + ".vanadium_corrections.fetch_correction_workspaces")
@@ -77,23 +84,31 @@ class FocusModelTest(unittest.TestCase):
self.model.focus_run("305761", banks, False, "ENGINX", "0")
self.assertEqual(0, plot_focus.call_count)
+ @patch(file_path + ".SaveFocusedXYE")
+ @patch(file_path + ".SaveGSS")
@patch(file_path + ".SaveNexus")
- def test_save_output_files_nexus_with_no_RB_number(self, save):
+ def test_save_output_files_with_no_RB_number(self, nexus, gss, xye):
mocked_workspace = "mocked-workspace"
output_file = path.join(path_handling.OUT_FILES_ROOT_DIR, "Focus",
"ENGINX_123_bank_North.nxs")
- self.model._save_focused_output_files_as_nexus("ENGINX", "Path/To/ENGINX000123.whatever",
- "North", mocked_workspace, None)
- self.assertEqual(1, save.call_count)
- save.assert_called_with(Filename=output_file, InputWorkspace=mocked_workspace)
+ self.model._save_output("ENGINX", "Path/To/ENGINX000123.whatever", "North",
+ mocked_workspace, None)
+
+ self.assertEqual(1, nexus.call_count)
+ self.assertEqual(1, gss.call_count)
+ self.assertEqual(1, xye.call_count)
+ nexus.assert_called_with(Filename=output_file, InputWorkspace=mocked_workspace)
+ @patch(file_path + ".SaveFocusedXYE")
+ @patch(file_path + ".SaveGSS")
@patch(file_path + ".SaveNexus")
- def test_save_output_files_nexus_with_RB_number(self, save):
- self.model._save_focused_output_files_as_nexus("ENGINX", "Path/To/ENGINX000123.whatever",
- "North", "mocked-workspace",
- "An Experiment Number")
- self.assertEqual(2, save.call_count)
+ def test_save_output_files_with_RB_number(self, nexus, gss, xye):
+ self.model._save_output("ENGINX", "Path/To/ENGINX000123.whatever", "North",
+ "mocked-workspace", "An Experiment Number")
+ self.assertEqual(nexus.call_count, 2)
+ self.assertEqual(gss.call_count, 2)
+ self.assertEqual(xye.call_count, 2)
if __name__ == '__main__':