diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f29e06c..2b1c17ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. +## [1.0.1] - 2020-11-03 +### Fixed +- Bug in pyerrors.covariance fixed that appeared when working with several + replica of different length. + ## [1.0.0] - 2020-10-13 ### Added - Compatibility with the BDIO Native format outlined [here](https://ific.uv.es/~alramos/docs/ADerrors/tutorial/). Read and write function added to input.bdio diff --git a/pyerrors/pyerrors.py b/pyerrors/pyerrors.py index 22632754..6c6a1130 100644 --- a/pyerrors/pyerrors.py +++ b/pyerrors/pyerrors.py @@ -852,12 +852,12 @@ def covariance(obs1, obs2, correlation=False, **kwargs): r_length.append(len(obs1.deltas[r_name])) - gamma += np.sum(obs1.deltas[r_name] * obs2.deltas[r_name]) / len(obs1.deltas[r_name]) + gamma += np.sum(obs1.deltas[r_name] * obs2.deltas[r_name]) e_N = np.sum(r_length) tau_combined = (obs1.e_tauint[e_name] + obs2.e_tauint[e_name]) / 2 - dvalue += gamma * (1 + 1 / e_N) / e_N * 2 * tau_combined + dvalue += gamma / e_N * (1 + 1 / e_N) / e_N * 2 * tau_combined if np.abs(dvalue / obs1.dvalue / obs2.dvalue) > 1.0: dvalue = np.sign(dvalue) * obs1.dvalue * obs2.dvalue @@ -1137,7 +1137,8 @@ def plot_corrs(observables, **kwargs): y[i] = observables[j][i].value y_err[i] = observables[j][i].dvalue - plt.errorbar(x, y, yerr=y_err, ls='none', fmt='o', capsize=3, markersize=5, label=label[j]) + plt.errorbar(x, y, yerr=y_err, ls='none', fmt='o', capsize=3, + markersize=5, lw=1, label=label[j]) if kwargs.get('logscale'): plt.yscale('log') diff --git a/setup.py b/setup.py index 237db485..3eeda16d 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup, find_packages setup(name='pyerrors', - version='1.0.0', + version='1.0.1', description='Error analysis for lattice QCD', author='Fabian Joswig', author_email='fabian.joswig@wwu.de',