Merge pull request #38514 from mantidproject/38030_remove_pop_up

Remove off-putting error prompt that appears when canceling a MaxEnt calculation in the Muon FDA interface

Author: SilkeSchomann

docs/source/release/v6.12.0/Muon/FDA/Bugfixes/38514.rst

@@ -0,0 +1 @@
+- Remove off-putting error prompt that appears when canceling a MaxEnt calculation in the :ref:`Muon FDA interface <Frequency_Domain_Analysis-ref>`

qt/python/mantidqtinterfaces/mantidqtinterfaces/Muon/GUI/FrequencyDomainAnalysis/MaxEnt/maxent_presenter.py

@@ -188,7 +188,11 @@ def calculate_maxent(self, alg):
             # this is caught as part of the calculation thread
             raise ValueError("Please select groups in the grouping tab")
         else:
-            maxent_workspace = run_MuonMaxent(maxent_parameters, alg, base_name)
+            try:
+                maxent_workspace = run_MuonMaxent(maxent_parameters, alg, base_name)
+            except KeyboardInterrupt:
+                return
+
             self.add_maxent_workspace_to_ADS(maxent_parameters["InputWorkspace"], maxent_workspace, alg)
 
     def _create_group_table(self):

qt/python/mantidqtinterfaces/test/Muon/max_ent_presenter_load_interaction_test.py

@@ -209,6 +209,20 @@ def test_calculate_maxent_fails(self, mock_maxent):
         self.assertEqual(self.presenter.add_maxent_workspace_to_ADS.call_count, 0)
         self.assertEqual(mock_maxent.call_count, 0)
 
+    @mock.patch("mantidqtinterfaces.Muon.GUI.FrequencyDomainAnalysis.MaxEnt.maxent_presenter.run_MuonMaxent")
+    def test_calculate_maxent_ignores_keyboardinterrupt(self, mock_maxent):
+        mock_maxent.side_effect = KeyboardInterrupt()
+        params = {"InputWorkspace": "test"}
+        self.presenter.get_parameters_for_maxent_calculation = mock.Mock(return_value=params)
+        type(self.presenter).use_groups = mock.PropertyMock(return_value=True)
+        type(self.presenter).get_num_groups = mock.PropertyMock(return_value=2)
+        self.presenter.add_maxent_workspace_to_ADS = mock.Mock()
+        alg = mock.Mock()
+
+        self.presenter.calculate_maxent(alg)
+        self.assertEqual(self.presenter.add_maxent_workspace_to_ADS.call_count, 0)
+        self.assertEqual(mock_maxent.call_count, 1)
+
     def test_create_group_table(self):
         group1 = MuonGroup("fwd", [1, 2, 3])
         type(self.presenter).get_selected_groups = mock.PropertyMock(return_value=[group1])