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 #29 from s-kuberski/feature/covobs

Browse source 
Feature/covobs
This commit is contained in:
Fabian Joswig 2021-12-14 13:21:43 +00:00 • committed by GitHub
commit 4454e3d82f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
pyerrors/obs.py
View file

@ -42,7 +42,7 @@ class Obs:
'ddvalue', 'reweighted', 'S', 'tau_exp', 'N_sigma', 'ddvalue', 'reweighted', 'S', 'tau_exp', 'N_sigma',
'e_dvalue', 'e_ddvalue', 'e_tauint', 'e_dtauint', 'e_dvalue', 'e_ddvalue', 'e_tauint', 'e_dtauint',
'e_windowsize', 'e_rho', 'e_drho', 'e_n_tauint', 'e_n_dtauint', 'e_windowsize', 'e_rho', 'e_drho', 'e_n_tauint', 'e_n_dtauint',
'idl', 'is_merged', 'tag', 'covobs', '__dict__'] 'idl', 'is_merged', 'tag', '_covobs', '__dict__']
S_global = 2.0 S_global = 2.0
S_dict = {} S_dict = {}
@ -52,7 +52,7 @@ class Obs:
N_sigma_dict = {} N_sigma_dict = {}
filter_eps = 1e-10 filter_eps = 1e-10
def __init__(self, samples, names, idl=None, means=None, covobs=None, **kwargs): def __init__(self, samples, names, idl=None, means=None, **kwargs):
""" Initialize Obs object. """ Initialize Obs object.
Parameters Parameters
@ -90,10 +90,7 @@ class Obs:
self.shape = {} self.shape = {}
self.r_values = {} self.r_values = {}
self.deltas = {} self.deltas = {}
if covobs is None: self._covobs = {}
self.covobs = {}
else:
self.covobs = covobs
self.idl = {} self.idl = {}
if len(samples): if len(samples):
@ -176,6 +173,10 @@ class Obs:
res[e_name].append(e_name) res[e_name].append(e_name)
return res return res
@property
def covobs(self):
return self._covobs
def gamma_method(self, **kwargs): def gamma_method(self, **kwargs):
"""Estimate the error and related properties of the Obs. """Estimate the error and related properties of the Obs.
@ -1191,9 +1192,7 @@ def derived_observable(func, data, array_mode=False, **kwargs):
final_result[i_val] = Obs(new_samples, new_names_obs, means=new_means, idl=new_idl) final_result[i_val] = Obs(new_samples, new_names_obs, means=new_means, idl=new_idl)
for name in new_covobs: for name in new_covobs:
final_result[i_val].names.append(name) final_result[i_val].names.append(name)
final_result[i_val].shape[name] = 1 final_result[i_val]._covobs = new_covobs
final_result[i_val].idl[name] = []
final_result[i_val].covobs = new_covobs
final_result[i_val]._value = new_val final_result[i_val]._value = new_val
final_result[i_val].is_merged = is_merged final_result[i_val].is_merged = is_merged
final_result[i_val].reweighted = reweighted final_result[i_val].reweighted = reweighted
@ -1560,10 +1559,8 @@ def cov_Obs(means, cov, name, grad=None):
o = Obs([], []) o = Obs([], [])
o._value = co.value o._value = co.value
o.names.append(co.name) o.names.append(co.name)
o.covobs[co.name] = co o._covobs[co.name] = co
o._dvalue = np.sqrt(co.errsq()) o._dvalue = np.sqrt(co.errsq())
o.shape[co.name] = 1
o.idl[co.name] = []
return o return o
ol = [] ol = []