lattice/pyerrors
1
0
Fork 0
mirror of https://github.com/fjosw/pyerrors.git synced 2025-05-14 19:43:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #129 from fjosw/fix/details_no_autocorrelation

Browse source 
Fix details w/ no autocorrelation
This commit is contained in:
Fabian Joswig 2022-10-21 12:18:52 +01:00 • committed by GitHub
commit 7489e316b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pyerrors/obs.py
View file

@ -699,8 +699,6 @@ class Obs:
return 'Obs[' + str(self) + ']' return 'Obs[' + str(self) + ']'
def __str__(self): def __str__(self):
if self._dvalue == 0.0:
return str(self.value)
return _format_uncertainty(self.value, self._dvalue) return _format_uncertainty(self.value, self._dvalue)
def __hash__(self): def __hash__(self):
@ -979,6 +977,8 @@ class CObs:
def _format_uncertainty(value, dvalue): def _format_uncertainty(value, dvalue):
"""Creates a string of a value and its error in paranthesis notation, e.g., 13.02(45)""" """Creates a string of a value and its error in paranthesis notation, e.g., 13.02(45)"""
if dvalue == 0.0:
return str(value)
fexp = np.floor(np.log10(dvalue)) fexp = np.floor(np.log10(dvalue))
if fexp < 0.0: if fexp < 0.0:
return '{:{form}}({:2.0f})'.format(value, dvalue * 10 ** (-fexp + 1), form='.' + str(-int(fexp) + 1) + 'f') return '{:{form}}({:2.0f})'.format(value, dvalue * 10 ** (-fexp + 1), form='.' + str(-int(fexp) + 1) + 'f')

6
tests/obs_test.py
View file

@ -998,6 +998,12 @@ def test_cobs_array():
cobs / np.ones((4, 4)) cobs / np.ones((4, 4))
def test_details_tau_no_error():
tt = pe.Obs([np.random.rand(500)], ["ens"])
tt.gamma_method(S=0)
tt.details()
def test_hash(): def test_hash():
obs = pe.pseudo_Obs(0.3, 0.1, "test") + pe.Obs([np.random.normal(2.3, 0.2, 200)], ["test2"], [range(1, 400, 2)]) obs = pe.pseudo_Obs(0.3, 0.1, "test") + pe.Obs([np.random.normal(2.3, 0.2, 200)], ["test2"], [range(1, 400, 2)])
o1 = obs + pe.cov_Obs(0.0, 0.1, "co") + pe.cov_Obs(0.0, 0.8, "co2") o1 = obs + pe.cov_Obs(0.0, 0.1, "co") + pe.cov_Obs(0.0, 0.8, "co2")