mirror of
https://github.com/fjosw/pyerrors.git
synced 2025-03-15 14:50:25 +01:00
commit
4454e3d82f
1 changed files with 9 additions and 12 deletions
|
@ -42,7 +42,7 @@ class Obs:
|
|||
'ddvalue', 'reweighted', 'S', 'tau_exp', 'N_sigma',
|
||||
'e_dvalue', 'e_ddvalue', 'e_tauint', 'e_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_dict = {}
|
||||
|
@ -52,7 +52,7 @@ class Obs:
|
|||
N_sigma_dict = {}
|
||||
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.
|
||||
|
||||
Parameters
|
||||
|
@ -90,10 +90,7 @@ class Obs:
|
|||
self.shape = {}
|
||||
self.r_values = {}
|
||||
self.deltas = {}
|
||||
if covobs is None:
|
||||
self.covobs = {}
|
||||
else:
|
||||
self.covobs = covobs
|
||||
self._covobs = {}
|
||||
|
||||
self.idl = {}
|
||||
if len(samples):
|
||||
|
@ -176,6 +173,10 @@ class Obs:
|
|||
res[e_name].append(e_name)
|
||||
return res
|
||||
|
||||
@property
|
||||
def covobs(self):
|
||||
return self._covobs
|
||||
|
||||
def gamma_method(self, **kwargs):
|
||||
"""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)
|
||||
for name in new_covobs:
|
||||
final_result[i_val].names.append(name)
|
||||
final_result[i_val].shape[name] = 1
|
||||
final_result[i_val].idl[name] = []
|
||||
final_result[i_val].covobs = new_covobs
|
||||
final_result[i_val]._covobs = new_covobs
|
||||
final_result[i_val]._value = new_val
|
||||
final_result[i_val].is_merged = is_merged
|
||||
final_result[i_val].reweighted = reweighted
|
||||
|
@ -1560,10 +1559,8 @@ def cov_Obs(means, cov, name, grad=None):
|
|||
o = Obs([], [])
|
||||
o._value = co.value
|
||||
o.names.append(co.name)
|
||||
o.covobs[co.name] = co
|
||||
o._covobs[co.name] = co
|
||||
o._dvalue = np.sqrt(co.errsq())
|
||||
o.shape[co.name] = 1
|
||||
o.idl[co.name] = []
|
||||
return o
|
||||
|
||||
ol = []
|
||||
|
|
Loading…
Add table
Reference in a new issue