IPKM/nmreval
17
2
Fork 1
Code Issues 42 Pull Requests Actions Packages Projects Releases Wiki Activity

fitting (#43)

Browse Source 
adjustments to fit to see if fit is at least running, could help with #39

Co-authored-by: Dominik Demuth <dominik.demuth@physik.tu-darmstadt.de>
Reviewed-on: #43
This commit is contained in:
Dominik Demuth
2023-04-08 18:37:07 +00:00
parent ffecc9c873
commit 02f8a3bb31
5 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui_qt/main/management.py
View File

@ -398,7 +398,7 @@ class UpperManagement(QtCore.QObject):
self.__fit_options = (parameter, links, fit_options)
fitter = FitRoutine()
self.fitter = FitRoutine()
models = {}
fit_limits = fit_options['limits']
fit_mode = fit_options['fit_mode']
@ -442,18 +442,18 @@ class UpperManagement(QtCore.QObject):
lb=model_p['lb'], ub=model_p['ub'],
fun_kwargs=set_params[1])
fitter.add_data(d)
self.fitter.add_data(d)
model_globs = model_p['glob']
if model_globs:
m.set_global_parameter(**model_p['glob'])
for links_i in links:
fitter.set_link_parameter((models[links_i[0]], links_i[1]),
(models[links_i[2]], links_i[3]))
self.fitter.set_link_parameter((models[links_i[0]], links_i[1]),
(models[links_i[2]], links_i[3]))
with busy_cursor():
self.fit_worker = FitWorker(fitter, fit_mode)
self.fit_worker = FitWorker(self.fitter, fit_mode)
self.fit_thread = QtCore.QThread()
self.fit_worker.moveToThread(self.fit_thread)
@ -469,7 +469,7 @@ class UpperManagement(QtCore.QObject):
@QtCore.pyqtSlot(list, bool)
def end_fit(self, result: list, success: bool):
print('FIT FINISHED')
logger.info('FIT FINISHED')
if success:
self.fitFinished.emit(result)
else: