diff --git a/corrlib/toml.py b/corrlib/toml.py index 0d4dfc8..eb40d5a 100644 --- a/corrlib/toml.py +++ b/corrlib/toml.py @@ -178,10 +178,8 @@ def import_toml(path: Path, file: str, copy_file: bool=True) -> None: update_aliases(path, uuid, aliases) else: uuid = import_project(path, project['url'], aliases=aliases) - imeas = 1 - nmeas = len(measurements.keys()) for mname, md in measurements.items(): - print(f"Import measurement {imeas}/{nmeas}: {mname}") + print("Import measurement: " + mname) ensemble = md['ensemble'] if project['code'] == 'sfcf': param = sfcf.read_param(path, uuid, md['param_file']) @@ -202,7 +200,7 @@ def import_toml(path: Path, file: str, copy_file: bool=True) -> None: param = openQCD.load_ms1_parfile(path, uuid, parameter_file) else: # Temporary solution - parameters: dict[str, Any] = {} + parameters = {} parameters["rand"] = {} parameters["rw_fcts"] = [{}] for nrw in range(1): @@ -234,7 +232,6 @@ def import_toml(path: Path, file: str, copy_file: bool=True) -> None: 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', [])) write_measurement(path, ensemble, measurement, uuid, project['code'], (md['param_file'] if 'param_file' in md else None)) - imeas += 1 print(mname + " imported.") if not os.path.exists(path / "toml_imports" / uuid):