lattice/pyerrors
1
0
Fork 0
mirror of https://github.com/fjosw/pyerrors.git synced 2025-03-15 14:50:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

indents fixed

Browse source
This commit is contained in:
Fabian Joswig 2021-10-12 10:17:58 +01:00
parent 311b0bf91a
commit 66c443fd63
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pyerrors/fits.py
View file

@ -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()))))

1
pyerrors/pyerrors.py
View file

@ -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