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

Fix: read_mesons and read_dSdm now return Obs with the correct idl based on the information in the bdio file.

Browse source
This commit is contained in:
Simon Kuberski 2022-04-13 18:20:13 +02:00
parent cd2f361a3e
commit a5394521e7
1 changed files with 68 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
pyerrors/input/bdio.py
View file

@ -302,11 +302,24 @@ def read_mesons(file_path, bdio_path='./libbdio.so', **kwargs):
Parameters Parameters
---------- ----------
file_path -- path to the bdio file file_path : str
bdio_path -- path to the shared bdio library libbdio.so (default ./libbdio.so) path to the bdio file
stop -- stops reading at given configuration number (default None) bdio_path : str
alternative_ensemble_name -- Manually overwrite ensemble name path to the shared bdio library libbdio.so (default ./libbdio.so)
start : int
The first configuration to be read (default 1)
stop : int
The last configuration to be read (default None)
step : int
Fixed step size between two measurements (default 1)
alternative_ensemble_name : str
Manually overwrite ensemble name
""" """
start = kwargs.get('start', 1)
stop = kwargs.get('stop', None)
step = kwargs.get('step', 1)
bdio = ctypes.cdll.LoadLibrary(bdio_path) bdio = ctypes.cdll.LoadLibrary(bdio_path)
bdio_open = bdio.bdio_open bdio_open = bdio.bdio_open
@ -353,9 +366,9 @@ def read_mesons(file_path, bdio_path='./libbdio.so', **kwargs):
prop_kappa = [] # Contains propagator kappas (Component of corr_kappa) prop_kappa = [] # Contains propagator kappas (Component of corr_kappa)
prop_source = [] # Contains propagator source positions prop_source = [] # Contains propagator source positions
# Check noise type for multiple replica? # Check noise type for multiple replica?
cnfg_no = -1
corr_no = -1 corr_no = -1
data = [] data = []
idl = []
fbdio = bdio_open(ctypes.c_char_p(b_path), ctypes.c_char_p(b_read), ctypes.c_char_p(b_form)) fbdio = bdio_open(ctypes.c_char_p(b_path), ctypes.c_char_p(b_read), ctypes.c_char_p(b_form))
@ -418,18 +431,20 @@ def read_mesons(file_path, bdio_path='./libbdio.so', **kwargs):
prop_kappa.append(_get_kwd(tmp_string, 'KAPPA=')) prop_kappa.append(_get_kwd(tmp_string, 'KAPPA='))
prop_source.append(_get_kwd(tmp_string, 'x0=')) prop_source.append(_get_kwd(tmp_string, 'x0='))
if ruinfo == 4: if ruinfo == 4:
if 'stop' in kwargs: cnfg_no = int(_get_kwd(tmp_string, 'CNFG_ID='))
if cnfg_no >= kwargs.get('stop') - 1: if stop:
if cnfg_no > kwargs.get('stop'):
break break
cnfg_no += 1 idl.append(cnfg_no)
print('\r%s %i' % ('Reading configuration', cnfg_no + 1), end='\r') print('\r%s %i' % ('Reading configuration', cnfg_no + 1), end='\r')
if cnfg_no == 0: if len(idl) == 1:
no_corrs = len(corr_name) no_corrs = len(corr_name)
data = [] data = []
for c in range(no_corrs): for c in range(no_corrs):
data.append([]) data.append([])
corr_no = 0 corr_no = 0
bdio_close(fbdio) bdio_close(fbdio)
print('\nEnsemble: ', ensemble_name) print('\nEnsemble: ', ensemble_name)
@ -441,7 +456,7 @@ def read_mesons(file_path, bdio_path='./libbdio.so', **kwargs):
print('Number of time values: ', d0) print('Number of time values: ', d0)
print('Number of random sources: ', d1) print('Number of random sources: ', d1)
print('Number of corrs: ', len(corr_name)) print('Number of corrs: ', len(corr_name))
print('Number of configurations: ', cnfg_no + 1) print('Number of configurations: ', len(idl))
corr_kappa = [] # Contains kappa values for both propagators of given correlation function corr_kappa = [] # Contains kappa values for both propagators of given correlation function
corr_source = [] corr_source = []
@ -452,11 +467,20 @@ def read_mesons(file_path, bdio_path='./libbdio.so', **kwargs):
else: else:
corr_source.append(int(prop_source[int(item[0])])) corr_source.append(int(prop_source[int(item[0])]))
if stop is None:
stop = idl[-1]
idl_target = range(start, stop + 1, step)
try:
indices = [idl.index(i) for i in idl_target]
except ValueError as err:
raise Exception('Configurations in file do no match target list!', err)
result = {} result = {}
for c in range(no_corrs): for c in range(no_corrs):
tmp_corr = [] tmp_corr = []
for t in range(d0 - 2): for t in range(d0 - 2):
tmp_corr.append(Obs([np.asarray(data[c])[:, t]], [ensemble_name])) deltas = [np.asarray(data[c])[:, t][index] for index in indices]
tmp_corr.append(Obs([deltas], [ensemble_name], idl=[idl_target]))
result[(corr_name[c], corr_source[c]) + tuple(sorted(corr_kappa[c]))] = tmp_corr result[(corr_name[c], corr_source[c]) + tuple(sorted(corr_kappa[c]))] = tmp_corr
# Check that all data entries have the same number of configurations # Check that all data entries have the same number of configurations
@ -480,10 +504,24 @@ def read_dSdm(file_path, bdio_path='./libbdio.so', **kwargs):
Parameters Parameters
---------- ----------
file_path -- path to the bdio file file_path : str
bdio_path -- path to the shared bdio library libbdio.so (default ./libbdio.so) path to the bdio file
stop -- stops reading at given configuration number (default None) bdio_path : str
path to the shared bdio library libbdio.so (default ./libbdio.so)
start : int
The first configuration to be read (default 1)
stop : int
The last configuration to be read (default None)
step : int
Fixed step size between two measurements (default 1)
alternative_ensemble_name : str
Manually overwrite ensemble name
""" """
start = kwargs.get('start', 1)
stop = kwargs.get('stop', None)
step = kwargs.get('step', 1)
bdio = ctypes.cdll.LoadLibrary(bdio_path) bdio = ctypes.cdll.LoadLibrary(bdio_path)
bdio_open = bdio.bdio_open bdio_open = bdio.bdio_open
@ -529,9 +567,9 @@ def read_dSdm(file_path, bdio_path='./libbdio.so', **kwargs):
# d1 = 0 # nnoise # d1 = 0 # nnoise
prop_kappa = [] # Contains propagator kappas (Component of corr_kappa) prop_kappa = [] # Contains propagator kappas (Component of corr_kappa)
# Check noise type for multiple replica? # Check noise type for multiple replica?
cnfg_no = -1
corr_no = -1 corr_no = -1
data = [] data = []
idl = []
fbdio = bdio_open(ctypes.c_char_p(b_path), ctypes.c_char_p(b_read), ctypes.c_char_p(b_form)) fbdio = bdio_open(ctypes.c_char_p(b_path), ctypes.c_char_p(b_read), ctypes.c_char_p(b_form))
@ -586,12 +624,13 @@ def read_dSdm(file_path, bdio_path='./libbdio.so', **kwargs):
if ruinfo == 2: if ruinfo == 2:
prop_kappa.append(_get_kwd(tmp_string, 'KAPPA=')) prop_kappa.append(_get_kwd(tmp_string, 'KAPPA='))
if ruinfo == 4: if ruinfo == 4:
if 'stop' in kwargs: cnfg_no = int(_get_kwd(tmp_string, 'CNFG_ID='))
if cnfg_no >= kwargs.get('stop') - 1: if stop:
if cnfg_no > kwargs.get('stop'):
break break
cnfg_no += 1 idl.append(cnfg_no)
print('\r%s %i' % ('Reading configuration', cnfg_no + 1), end='\r') print('\r%s %i' % ('Reading configuration', cnfg_no + 1), end='\r')
if cnfg_no == 0: if len(idl) == 1:
no_corrs = len(corr_name) no_corrs = len(corr_name)
data = [] data = []
for c in range(no_corrs): for c in range(no_corrs):
@ -612,9 +651,18 @@ def read_dSdm(file_path, bdio_path='./libbdio.so', **kwargs):
for item in corr_props: for item in corr_props:
corr_kappa.append(float(prop_kappa[int(item)])) corr_kappa.append(float(prop_kappa[int(item)]))
if stop is None:
stop = idl[-1]
idl_target = range(start, stop + 1, step)
try:
indices = [idl.index(i) for i in idl_target]
except ValueError as err:
raise Exception('Configurations in file do no match target list!', err)
result = {} result = {}
for c in range(no_corrs): for c in range(no_corrs):
result[(corr_name[c], str(corr_kappa[c]))] = Obs([np.asarray(data[c])], [ensemble_name]) deltas = [np.asarray(data[c])[index] for index in indices]
result[(corr_name[c], str(corr_kappa[c]))] = Obs([deltas], [ensemble_name], idl=[idl_target])
# Check that all data entries have the same number of configurations # Check that all data entries have the same number of configurations
if len(set([o.N for o in list(result.values())])) != 1: if len(set([o.N for o in list(result.values())])) != 1: