fixed overwrite of weight option for deltay, resulted in invalid weights; closes #117
This commit is contained in:
parent
4e865cd0c6
commit
e2e52cebde
@ -434,7 +434,7 @@ class UpperManagement(QtCore.QObject):
|
|||||||
models = {}
|
models = {}
|
||||||
fit_limits = fit_options['limits']
|
fit_limits = fit_options['limits']
|
||||||
fit_mode = fit_options['fit_mode']
|
fit_mode = fit_options['fit_mode']
|
||||||
we = fit_options['we']
|
we_option = fit_options['we']
|
||||||
|
|
||||||
for model_id, model_p in parameter.items():
|
for model_id, model_p in parameter.items():
|
||||||
m = Model(model_p['func'])
|
m = Model(model_p['func'])
|
||||||
@ -453,8 +453,10 @@ class UpperManagement(QtCore.QObject):
|
|||||||
data_i = self.data[set_id]
|
data_i = self.data[set_id]
|
||||||
set_params = model_p['parameter'][set_id]
|
set_params = model_p['parameter'][set_id]
|
||||||
|
|
||||||
if we.lower() == 'deltay':
|
if we_option.lower() == 'deltay':
|
||||||
we = data_i.y_err**2
|
we = data_i.y_err**2
|
||||||
|
else:
|
||||||
|
we = we_option
|
||||||
|
|
||||||
if m_complex is None or m_complex == 1:
|
if m_complex is None or m_complex == 1:
|
||||||
_y = data_i.y.real
|
_y = data_i.y.real
|
||||||
|
Loading…
Reference in New Issue
Block a user