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

rename functions, let write_measurement decide which file type is given
Some checks failed
Pytest / pytest (3.12) (push) Waiting to run
Details
Pytest / pytest (3.13) (push) Waiting to run
Details
Pytest / pytest (3.14) (push) Waiting to run
Details
Ruff / ruff (push) Waiting to run
Details
Mypy / mypy (push) Has been cancelled
Details
Mypy / mypy (pull_request) Waiting to run
Details
Pytest / pytest (3.12) (pull_request) Waiting to run
Details
Pytest / pytest (3.13) (pull_request) Waiting to run
Details
Pytest / pytest (3.14) (pull_request) Waiting to run
Details
Ruff / ruff (pull_request) Waiting to run
Details

Browse source
This commit is contained in:
Justus Kuhlmann 2026-04-09 11:23:28 +02:00
commit 8394b1fdbd
Signed by: jkuhl
GPG key ID: 00ED992DD79B85A6
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
corrlib/toml.py
View file

@ -192,12 +192,16 @@ def import_toml(path: Path, file: str, copy_file: bool=True) -> None:
elif project['code'] == 'openQCD':
if md['measurement'] == 'ms1':
param = openQCD.read_ms1_param(path, uuid, md['param_file'])
parameter_file = md['param_file']
if parameter_file.endswith(".ms1.in"):
param = openQCD.load_ms1_infile(path, uuid, parameter_file)
elif parameter_file.endswith(".ms1.par"):
param = openQCD.load_ms1_parfile(path, uuid, parameter_file)
param['type'] = 'ms1'
measurement = openQCD.read_rwms(path, uuid, md['path'], param, md["prefix"], version=md["version"], names=md['names'], files=md['files'])
elif md['measurement'] == 't0':
if 'param_file' in md:
param = openQCD.read_ms3_param(path, uuid, md['param_file'])
param = openQCD.load_ms3_infile(path, uuid, md['param_file'])
else:
param = {}
for rwp in ["integrator", "eps", "ntot", "dnms"]:
@ -207,7 +211,7 @@ def import_toml(path: Path, file: str, copy_file: bool=True) -> None:
fit_range=int(md.get('fit_range', 5)), postfix=str(md.get('postfix', '')), names=md.get('names', []), files=md.get('files', []))
elif md['measurement'] == 't1':
if 'param_file' in md:
param = openQCD.read_ms3_param(path, uuid, md['param_file'])
param = openQCD.load_ms3_infile(path, uuid, md['param_file'])
param['type'] = 't1'
measurement = openQCD.extract_t1(path, uuid, md['path'], param, str(md["prefix"]), int(md["dtr_read"]), int(md["xmin"]), int(md["spatial_extent"]),
fit_range=int(md.get('fit_range', 5)), postfix=str(md.get('postfix', '')), names=md.get('names', []), files=md.get('files', []))