lattice/pyerrors
1
0
Fork 0
mirror of https://github.com/fjosw/pyerrors.git synced 2026-08-04 19:41:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

feat: removed attribute is_merged.

Browse source
This commit is contained in:
Fabian Joswig 2023-01-06 13:34:26 +01:00
commit a53fb18821
No known key found for this signature in database
6 changed files with 2 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pyerrors/input/json.py
View file

@ -41,8 +41,6 @@ def create_json_string(ol, description='', indent=1):
for r_name in ol[0].e_content[name]:
rd = {}
rd['name'] = r_name
if ol[0].is_merged.get(r_name, False):
rd['is_merged'] = True
rd['deltas'] = []
offsets = [o.r_values[r_name] - o.value for o in ol]
deltas = np.column_stack([ol[oi].deltas[r_name] + offsets[oi] for oi in range(No)])
@ -138,7 +136,6 @@ def create_json_string(ol, description='', indent=1):
for name in obs._covobs:
my_obs.names.append(name)
my_obs.reweighted = obs.reweighted
my_obs.is_merged = obs.is_merged
return my_obs
def write_Corr_to_dict(my_corr):
@ -258,7 +255,6 @@ def _parse_json_dict(json_dict, verbose=True, full_output=False):
retd['names'] = []
retd['idl'] = []
retd['deltas'] = []
retd['is_merged'] = {}
for ens in d:
for rep in ens['replica']:
rep_name = rep['name']
@ -270,7 +266,6 @@ def _parse_json_dict(json_dict, verbose=True, full_output=False):
retd['names'].append(rep_name)
retd['idl'].append([di[0] for di in rep['deltas']])
retd['deltas'].append(np.array([di[1:] for di in rep['deltas']]))
retd['is_merged'][rep_name] = rep.get('is_merged', False)
return retd
def _gen_covobsd_from_cdatad(d):
@ -300,7 +295,6 @@ def _parse_json_dict(json_dict, verbose=True, full_output=False):
if od:
ret = Obs([[ddi[0] + values[0] for ddi in di] for di in od['deltas']], od['names'], idl=od['idl'])
ret._value = values[0]
ret.is_merged = od['is_merged']
else:
ret = Obs([], [], means=[])
ret._value = values[0]
@ -326,7 +320,6 @@ def _parse_json_dict(json_dict, verbose=True, full_output=False):
if od:
ret.append(Obs([list(di[:, i] + values[i]) for di in od['deltas']], od['names'], idl=od['idl']))
ret[-1]._value = values[i]
ret[-1].is_merged = od['is_merged']
else:
ret.append(Obs([], [], means=[]))
ret[-1]._value = values[i]
@ -354,7 +347,6 @@ def _parse_json_dict(json_dict, verbose=True, full_output=False):
if od:
ret.append(Obs([di[:, i] + values[i] for di in od['deltas']], od['names'], idl=od['idl']))
ret[-1]._value = values[i]
ret[-1].is_merged = od['is_merged']
else:
ret.append(Obs([], [], means=[]))
ret[-1]._value = values[i]