Skip to content
Snippets Groups Projects
Unverified Commit fcb44382 authored by Gigg, Martyn Anthony's avatar Gigg, Martyn Anthony Committed by GitHub
Browse files

Merge pull request #28111 from mantidproject/28078_Muon_seq_tf_fit_error

Fixing Muon sequential TF asymmetry fits bug
parents dcc97b72 224c9a4b
No related branches found
No related tags found
No related merge requests found
...@@ -102,7 +102,7 @@ class FittingTabModel(object): ...@@ -102,7 +102,7 @@ class FittingTabModel(object):
self._handle_single_fit_results(parameter_dict['InputWorkspace'], function_object, fitting_parameters_table, self._handle_single_fit_results(parameter_dict['InputWorkspace'], function_object, fitting_parameters_table,
output_workspace, covariance_matrix, plot_fit) output_workspace, covariance_matrix, plot_fit)
return function_object.clone(), output_status, output_chi_squared return function_object, output_status, output_chi_squared
def do_single_tf_fit(self, parameter_dict, plot_fit=True): def do_single_tf_fit(self, parameter_dict, plot_fit=True):
alg = mantid.AlgorithmManager.create("CalculateMuonAsymmetry") alg = mantid.AlgorithmManager.create("CalculateMuonAsymmetry")
...@@ -114,7 +114,7 @@ class FittingTabModel(object): ...@@ -114,7 +114,7 @@ class FittingTabModel(object):
fitting_parameters_table, output_workspace, covariance_matrix, fitting_parameters_table, output_workspace, covariance_matrix,
plot_fit) plot_fit)
return function_object.clone(), output_status, output_chi_squared return function_object, output_status, output_chi_squared
def do_single_fit_and_return_workspace_parameters_and_fit_function( def do_single_fit_and_return_workspace_parameters_and_fit_function(
self, parameters_dict): self, parameters_dict):
...@@ -210,7 +210,6 @@ class FittingTabModel(object): ...@@ -210,7 +210,6 @@ class FittingTabModel(object):
output_chi_squared_list = [] output_chi_squared_list = []
for i, input_workspace in enumerate(workspace_list): for i, input_workspace in enumerate(workspace_list):
params = self.get_parameters_for_single_fit(input_workspace) params = self.get_parameters_for_single_fit(input_workspace)
if not use_initial_values and i >= 1: if not use_initial_values and i >= 1:
...@@ -220,8 +219,8 @@ class FittingTabModel(object): ...@@ -220,8 +219,8 @@ class FittingTabModel(object):
function_object, output_status, output_chi_squared = self.do_single_fit(params, function_object, output_status, output_chi_squared = self.do_single_fit(params,
plot_fit) plot_fit)
function_object_list.append(function_object)
function_object_list.append(function_object)
output_status_list.append(output_status) output_status_list.append(output_status)
output_chi_squared_list.append(output_chi_squared) output_chi_squared_list.append(output_chi_squared)
...@@ -245,7 +244,6 @@ class FittingTabModel(object): ...@@ -245,7 +244,6 @@ class FittingTabModel(object):
self.global_parameters, self.global_parameters,
plot_fit) plot_fit)
function_object_list.append(function_object) function_object_list.append(function_object)
output_status_list.append(output_status) output_status_list.append(output_status)
output_chi_squared_list.append(output_chi_squared) output_chi_squared_list.append(output_chi_squared)
...@@ -261,14 +259,13 @@ class FittingTabModel(object): ...@@ -261,14 +259,13 @@ class FittingTabModel(object):
if not use_initial_values and i >= 1: if not use_initial_values and i >= 1:
previous_values = self.get_fit_function_parameter_values(function_object_list[i - 1]) previous_values = self.get_fit_function_parameter_values(function_object_list[i - 1])
self.set_fit_function_parameter_values(params['Function'], self.set_fit_function_parameter_values(params['InputFunction'],
previous_values) previous_values)
function_object, output_status, output_chi_squared = self.do_single_tf_fit(params, function_object, output_status, output_chi_squared = self.do_single_tf_fit(params,
plot_fit) plot_fit)
function_object_list.append(function_object) function_object_list.append(function_object)
output_status_list.append(output_status) output_status_list.append(output_status)
output_chi_squared_list.append(output_chi_squared) output_chi_squared_list.append(output_chi_squared)
...@@ -284,7 +281,7 @@ class FittingTabModel(object): ...@@ -284,7 +281,7 @@ class FittingTabModel(object):
if not use_initial_values and i >= 1: if not use_initial_values and i >= 1:
previous_values = self.get_fit_function_parameter_values(function_object_list[i - 1]) previous_values = self.get_fit_function_parameter_values(function_object_list[i - 1])
self.set_fit_function_parameter_values(params['Function'], self.set_fit_function_parameter_values(params['InputFunction'],
previous_values) previous_values)
function_object, output_status, output_chi_squared = self.do_simultaneous_tf_fit(params, function_object, output_status, output_chi_squared = self.do_simultaneous_tf_fit(params,
...@@ -292,7 +289,6 @@ class FittingTabModel(object): ...@@ -292,7 +289,6 @@ class FittingTabModel(object):
plot_fit) plot_fit)
function_object_list.append(function_object) function_object_list.append(function_object)
output_status_list.append(output_status) output_status_list.append(output_status)
output_chi_squared_list.append(output_chi_squared) output_chi_squared_list.append(output_chi_squared)
......
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