jkuhl/corrlib
1
0
Fork 0
Code Issues Pull requests Releases Packages Activity

fix for standard cases

Browse source
This commit is contained in:
Justus Kuhlmann 2025-03-31 19:36:37 +00:00
parent e8047d49ff
commit d6f6cb0f42
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
corrlib/input/sfcf.py
View file

@ -139,7 +139,11 @@ def read_param(path, project, file_in_project):
if line.startswith('mrr'): if line.startswith('mrr'):
num_mrr = line.split()[1] num_mrr = line.split()[1]
for i in range(int(num_mrr)): for i in range(int(num_mrr)):
params['mrr'].append(lines[lines.index(line) + i + 1].split("#")[0].strip()) mrr = lines[lines.index(line) + i + 1]
mrr = mrr.split("#")[0]
mrr = mrr.strip()
mrr = mrr.replace("\t", " ")
params['mrr'].append(mrr)
if line.startswith('crr'): if line.startswith('crr'):
num_crr = line.split()[1] num_crr = line.split()[1]
@ -168,8 +172,11 @@ def read_param(path, project, file_in_project):
if params['wf_offsets'] == []: if params['wf_offsets'] == []:
params['wf_offsets'] = [[0, 0, 0]] params['wf_offsets'] = [[0, 0, 0]]
if params['wf_basis'] == []:
params['wf_basis'] = [[0, -1]]
if params['wf_coeff'] == []: if params['wf_coeff'] == []:
params['wf_coeff'] = [[0, -1]] params['wf_coeff'] = [[1]]
return params return params
@ -240,6 +247,7 @@ def read_data(path, project, dir_in_project, prefix, param, version='1.0c', cfg_
raise ValueError('Correlator type not known.') raise ValueError('Correlator type not known.')
corr_type_list.append(corr_types[corr_name]) corr_type_list.append(corr_types[corr_name])
data = {}
if not param['crr'] == []: if not param['crr'] == []:
if names is not None: if names is not None:
data_crr = pe.input.sfcf.read_sfcf_multi(directory, prefix, param['crr'], param['mrr'], corr_type_list, range(len(param['wf_offsets'])), data_crr = pe.input.sfcf.read_sfcf_multi(directory, prefix, param['crr'], param['mrr'], corr_type_list, range(len(param['wf_offsets'])),
@ -247,16 +255,12 @@ def read_data(path, project, dir_in_project, prefix, param, version='1.0c', cfg_
else: else:
data_crr = pe.input.sfcf.read_sfcf_multi(directory, prefix, param['crr'], param['mrr'], corr_type_list, range(len(param['wf_offsets'])), data_crr = pe.input.sfcf.read_sfcf_multi(directory, prefix, param['crr'], param['mrr'], corr_type_list, range(len(param['wf_offsets'])),
range(len(param['wf_basis'])), range(len(param['wf_basis'])), version, cfg_seperator, keyed_out=True) range(len(param['wf_basis'])), range(len(param['wf_basis'])), version, cfg_seperator, keyed_out=True)
if not param['crs'] == []:
data_crs = pe.input.sfcf.read_sfcf_multi(directory, param['crs'])
data = {}
if not param['crr'] == []:
for key in data_crr.keys(): for key in data_crr.keys():
data[key] = data_crr[key] data[key] = data_crr[key]
print("Read data:", data_crr)
print(f"Read data: pe.input.sfcf.read_sfcf_multi({directory}, {prefix}, {param['crr']}, {param['mrr']}, {corr_type_list}, {range(len(param['wf_offsets']))}, {range(len(param['wf_basis']))}, {range(len(param['wf_basis']))}, {version}, {cfg_seperator}, keyed_out=True, names={names})")
if not param['crs'] == []: if not param['crs'] == []:
data_crs = pe.input.sfcf.read_sfcf_multi(directory, param['crs'])
for key in data_crs.keys(): for key in data_crs.keys():
data[key] = data_crs[key] data[key] = data_crs[key]