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

bugs in derived_array and gamma_method fixed which caused odd behaviour

Browse source 
in connection with irregular monte carlo chains
This commit is contained in:
Fabian Joswig 2021-11-12 09:39:18 +00:00
parent 17f7753225
commit 0644ecf9aa
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pyerrors/linalg.py
View file

@ -86,7 +86,7 @@ def derived_array(func, data, **kwargs):
for name in new_names: for name in new_names:
d_extracted[name] = [] d_extracted[name] = []
for i_dat, dat in enumerate(data): for i_dat, dat in enumerate(data):
ens_length = new_idl_d[name][-1] - new_idl_d[name][0] + 1 ens_length = len(new_idl_d[name])
d_extracted[name].append(np.array([_expand_deltas_for_merge(o.deltas[name], o.idl[name], o.shape[name], new_idl_d[name]) for o in dat.reshape(np.prod(dat.shape))]).reshape(dat.shape + (ens_length, ))) d_extracted[name].append(np.array([_expand_deltas_for_merge(o.deltas[name], o.idl[name], o.shape[name], new_idl_d[name]) for o in dat.reshape(np.prod(dat.shape))]).reshape(dat.shape + (ens_length, )))
for i_val, new_val in np.ndenumerate(new_values): for i_val, new_val in np.ndenumerate(new_values):

4
pyerrors/obs.py
View file

@ -248,7 +248,7 @@ class Obs:
r_length = [] r_length = []
for r_name in e_content[e_name]: for r_name in e_content[e_name]:
if self.idl[r_name] is range: if isinstance(self.idl[r_name], range):
r_length.append(len(self.idl[r_name])) r_length.append(len(self.idl[r_name]))
else: else:
r_length.append((self.idl[r_name][-1] - self.idl[r_name][0] + 1)) r_length.append((self.idl[r_name][-1] - self.idl[r_name][0] + 1))
@ -339,7 +339,7 @@ class Obs:
idx -- List or range of configs on which the deltas are defined. idx -- List or range of configs on which the deltas are defined.
shape -- Number of configs in idx. shape -- Number of configs in idx.
""" """
if type(idx) is range: if isinstance(idx, range):
return deltas return deltas
else: else:
ret = np.zeros(idx[-1] - idx[0] + 1) ret = np.zeros(idx[-1] - idx[0] + 1)