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

Merge branch 'main' into dsc

Browse Source 
# Conflicts:
#	src/gui_qt/main/mainwindow.py
This commit is contained in:
Dominik Demuth
2023-06-20 18:07:52 +02:00
parent 354d5cbc99 22f8bc80ed
commit 032ffb72b1
34 changed files with 646 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,7 +343,7 @@ class UpperManagement(QtCore.QObject):
if joined is None:
joined = data_i.copy()
else:
joined.append(data_i.x, data_i.y, data_i.y_err)
joined.append(data_i.data.x, data_i.data.y, y_err=data_i.data.y_err, mask=data_i.data.mask)
name_set.add(data_i.name)
group_set.add(data_i.group)
@ -653,12 +653,10 @@ class UpperManagement(QtCore.QObject):
else:
continue
for key, pvalue in data.parameter.items():
name = pvalue.full_name
fit_key = key + data.model_name
for fit_key, pvalue in data.parameter.items():
if fit_key not in fit_dict:
fit_dict[fit_key] = [[], name]
fit_dict[fit_key] = [[], fit_key]
err = 0 if pvalue.error is None else pvalue.error