Skip to content

Commit

Permalink
Removed commas from workspace names Re #26443
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Andrew committed Jul 22, 2019
1 parent 967d1ab commit da61495
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion scripts/Muon/GUI/Common/ADSHandler/workspace_naming.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def get_pair_data_directory(context, run):

def get_phase_table_workspace_name(raw_workspace, forward_group, backward_group):
workspace_name = raw_workspace.replace('_raw_data', '; PhaseTable')
workspace_name += '; ' + forward_group + ', ' + backward_group
workspace_name += '; ' + forward_group + '; ' + backward_group
return workspace_name


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def test_create_parameters_for_cal_muon_phase_returns_correct_parameter_dict(sel

self.assertEqual(result, {'BackwardSpectra': [2, 4, 6, 8, 10], 'FirstGoodData': 0.1, 'ForwardSpectra': [1, 3, 5, 7, 9],
'InputWorkspace': workspace_name, 'LastGoodData': 15,
'DetectorTable': 'input_workspace_name; PhaseTable; fwd, bwd'})
'DetectorTable': 'input_workspace_name; PhaseTable; fwd; bwd'})

def test_correctly_retrieves_workspace_names_associsated_to_current_runs(self):
self.view.set_input_combo_box = mock.MagicMock()
Expand Down Expand Up @@ -102,7 +102,7 @@ def test_handle_calculate_phase_table_clicked_behaves_correctly_for_succesful_ca
self.presenter.handle_calulate_phase_table_clicked()
self.wait_for_thread(self.presenter.calculation_thread)

self.presenter.add_phase_table_to_ADS.assert_called_once_with('MUSR22222; PhaseTable_period_1; fwd, bwd', detector_table_mock)
self.presenter.add_phase_table_to_ADS.assert_called_once_with('MUSR22222; PhaseTable_period_1; fwd; bwd', detector_table_mock)
self.assertTrue(self.view.isEnabled())

@mock.patch('Muon.GUI.Common.phase_table_widget.phase_table_presenter.run_CalMuonDetectorPhases')
Expand Down

0 comments on commit da61495

Please sign in to comment.