lattice/pyerrors
1
0
Fork 0
mirror of https://github.com/fjosw/pyerrors.git synced 2025-03-15 14:50:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

corrected sfcf_read_multi behaviour (#238)

Browse source
This commit is contained in:
Justus Kuhlmann 2024-08-15 19:00:52 +02:00 • committed by GitHub
parent d17513f043
commit 7ca9d4ee41
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pyerrors/input/sfcf.py
View file

@ -224,12 +224,23 @@ def read_sfcf_multi(path, prefix, name_list, quarks_list=['.*'], corr_type_list=
intern[name]["spec"][quarks][off] = {} intern[name]["spec"][quarks][off] = {}
for w in wf_list: for w in wf_list:
intern[name]["spec"][quarks][off][w] = {} intern[name]["spec"][quarks][off][w] = {}
if b2b:
for w2 in wf2_list: for w2 in wf2_list:
intern[name]["spec"][quarks][off][w][w2] = {} intern[name]["spec"][quarks][off][w][w2] = {}
intern[name]["spec"][quarks][off][w][w2]["pattern"] = _make_pattern(version, name, off, w, w2, intern[name]['b2b'], quarks) intern[name]["spec"][quarks][off][w][w2]["pattern"] = _make_pattern(version, name, off, w, w2, intern[name]['b2b'], quarks)
else:
intern[name]["spec"][quarks][off][w]["0"] = {}
intern[name]["spec"][quarks][off][w]["0"]["pattern"] = _make_pattern(version, name, off, w, 0, intern[name]['b2b'], quarks)
internal_ret_dict = {} internal_ret_dict = {}
needed_keys = _lists2key(name_list, quarks_list, noffset_list, wf_list, wf2_list) needed_keys = []
for name, corr_type in zip(name_list, corr_type_list):
b2b, single = _extract_corr_type(corr_type)
if b2b:
needed_keys.extend(_lists2key([name], quarks_list, noffset_list, wf_list, wf2_list))
else:
needed_keys.extend(_lists2key([name], quarks_list, noffset_list, wf_list, ["0"]))
for key in needed_keys: for key in needed_keys:
internal_ret_dict[key] = [] internal_ret_dict[key] = []
@ -270,10 +281,14 @@ def read_sfcf_multi(path, prefix, name_list, quarks_list=['.*'], corr_type_list=
if i == 0: if i == 0:
if version != "0.0" and compact: if version != "0.0" and compact:
file = path + '/' + item + '/' + sub_ls[0] file = path + '/' + item + '/' + sub_ls[0]
for name in name_list: for name_index, name in enumerate(name_list):
if version == "0.0" or not compact: if version == "0.0" or not compact:
file = path + '/' + item + '/' + sub_ls[0] + '/' + name file = path + '/' + item + '/' + sub_ls[0] + '/' + name
for key in _lists2key(quarks_list, noffset_list, wf_list, wf2_list): if corr_type_list[name_index] == 'bi':
name_keys = _lists2key(quarks_list, noffset_list, wf_list, ["0"])
else:
name_keys = _lists2key(quarks_list, noffset_list, wf_list, wf2_list)
for key in name_keys:
specs = _key2specs(key) specs = _key2specs(key)
quarks = specs[0] quarks = specs[0]
off = specs[1] off = specs[1]
@ -368,7 +383,7 @@ def read_sfcf_multi(path, prefix, name_list, quarks_list=['.*'], corr_type_list=
result.append(Obs(internal_ret_dict[key][t], new_names, idl=idl)) result.append(Obs(internal_ret_dict[key][t], new_names, idl=idl))
result_dict[key] = result result_dict[key] = result
else: else:
for name in name_list: for name, corr_type in zip(name_list, corr_type_list):
result_dict[name] = {} result_dict[name] = {}
for quarks in quarks_list: for quarks in quarks_list:
result_dict[name][quarks] = {} result_dict[name][quarks] = {}
@ -376,12 +391,19 @@ def read_sfcf_multi(path, prefix, name_list, quarks_list=['.*'], corr_type_list=
result_dict[name][quarks][off] = {} result_dict[name][quarks][off] = {}
for w in wf_list: for w in wf_list:
result_dict[name][quarks][off][w] = {} result_dict[name][quarks][off][w] = {}
if corr_type != 'bi':
for w2 in wf2_list: for w2 in wf2_list:
key = _specs2key(name, quarks, off, w, w2) key = _specs2key(name, quarks, off, w, w2)
result = [] result = []
for t in range(intern[name]["T"]): for t in range(intern[name]["T"]):
result.append(Obs(internal_ret_dict[key][t], new_names, idl=idl)) result.append(Obs(internal_ret_dict[key][t], new_names, idl=idl))
result_dict[name][quarks][str(off)][str(w)][str(w2)] = result result_dict[name][quarks][str(off)][str(w)][str(w2)] = result
else:
key = _specs2key(name, quarks, off, w, "0")
result = []
for t in range(intern[name]["T"]):
result.append(Obs(internal_ret_dict[key][t], new_names, idl=idl))
result_dict[name][quarks][str(off)][str(w)][str(0)] = result
return result_dict return result_dict