From d6f6cb0f42a90ca2bb7dd5f22286439ec222a2c1 Mon Sep 17 00:00:00 2001 From: Justus Kuhlmann Date: Mon, 31 Mar 2025 19:36:37 +0000 Subject: [PATCH] fix for standard cases --- corrlib/input/sfcf.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/corrlib/input/sfcf.py b/corrlib/input/sfcf.py index b2eb630..896ba44 100644 --- a/corrlib/input/sfcf.py +++ b/corrlib/input/sfcf.py @@ -139,7 +139,11 @@ def read_param(path, project, file_in_project): if line.startswith('mrr'): num_mrr = line.split()[1] 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'): num_crr = line.split()[1] @@ -168,8 +172,11 @@ def read_param(path, project, file_in_project): if params['wf_offsets'] == []: params['wf_offsets'] = [[0, 0, 0]] + if params['wf_basis'] == []: + params['wf_basis'] = [[0, -1]] + if params['wf_coeff'] == []: - params['wf_coeff'] = [[0, -1]] + params['wf_coeff'] = [[1]] 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.') corr_type_list.append(corr_types[corr_name]) + data = {} if not param['crr'] == []: 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'])), @@ -247,16 +255,12 @@ def read_data(path, project, dir_in_project, prefix, param, version='1.0c', cfg_ else: 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) - - 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(): 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'] == []: + data_crs = pe.input.sfcf.read_sfcf_multi(directory, param['crs']) for key in data_crs.keys(): data[key] = data_crs[key]