diff --git a/pyerrors/fits.py b/pyerrors/fits.py index 47687932..1faf1d3b 100644 --- a/pyerrors/fits.py +++ b/pyerrors/fits.py @@ -146,7 +146,7 @@ def standard_fit(x, y, func, silent=False, **kwargs): result_dict['chisquare/expected_chisquare'] = chisquare / expected_chisquare if not silent: print('chisquare/expected_chisquare:', - result_dict['chisquare/expected_chisquare']) + result_dict['chisquare/expected_chisquare']) hess_inv = np.linalg.pinv(jacobian(jacobian(chisqfunc))(fit_result.x)) @@ -305,7 +305,7 @@ def odr_fit(x, y, func, silent=False, **kwargs): result_dict['chisquare/expected_chisquare'] = odr_chisquare(np.concatenate((output.beta, output.xplus.ravel()))) / expected_chisquare if not silent: print('chisquare/expected_chisquare:', - result_dict['chisquare/expected_chisquare']) + result_dict['chisquare/expected_chisquare']) hess_inv = np.linalg.pinv(jacobian(jacobian(odr_chisquare))(np.concatenate((output.beta, output.xplus.ravel())))) diff --git a/pyerrors/pyerrors.py b/pyerrors/pyerrors.py index d36a20fa..b7b52f82 100644 --- a/pyerrors/pyerrors.py +++ b/pyerrors/pyerrors.py @@ -1064,6 +1064,7 @@ def load_object(path): with open(path, 'rb') as file: return pickle.load(file) + def merge_obs(list_of_obs): """Combine all observables in list_of_obs into one new observable