From 77ee4993f011373f1711b4c7af37b7c059709d9b Mon Sep 17 00:00:00 2001 From: Justus Kuhlmann Date: Mon, 7 Apr 2025 19:59:26 +0000 Subject: [PATCH] fix small bugs --- corrlib/main.py | 7 +++++-- corrlib/toml.py | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/corrlib/main.py b/corrlib/main.py index cc48f4e..bac9182 100644 --- a/corrlib/main.py +++ b/corrlib/main.py @@ -55,14 +55,17 @@ def update_project_data(db, uuid, prop, value = None): def update_aliases(path, uuid, aliases): known_data = _project_lookup_by_id(path + "/backlogger.db", uuid)[0] known_aliases = known_data[1] + if aliases is None: + aliases = [] if known_aliases is None: print(f"Project {uuid} is already imported, no known aliases.") + known_alias_list = [] else: print(f"Project {uuid} is already imported, known by names: {known_aliases}") - known_alias_list = str2list(known_aliases) + known_alias_list = str2list(known_aliases) new_alias_list = known_alias_list for aka in aliases: - if aka not in known_aliases: + if aka not in known_alias_list: new_alias_list.append(aka) if not len(new_alias_list) == len(known_alias_list): alias_str = list2str(new_alias_list) diff --git a/corrlib/toml.py b/corrlib/toml.py index 88b62a9..45dcb1f 100644 --- a/corrlib/toml.py +++ b/corrlib/toml.py @@ -89,7 +89,8 @@ def import_toml(path: str, file: str, copy_file: bool=True) -> None: elif project['code'] == 'openQCD': param = openQCD.read_param(path, uuid, md['param_file']) param['type'] = md['measurement'] - measurement = openQCD.read_rwms(path, uuid, md['path'], md["prefix"], version=md["version"], names=md['names'], files=md['files']) + measurement = openQCD.read_rwms(path, uuid, md['path'], param, md["prefix"], version=md["version"], names=md['names'], files=md['files']) + write_measurement(path, ensemble, measurement, uuid, project['code'], md['param_file']) if not os.path.exists(os.path.join(path, "toml_imports", uuid)): @@ -122,5 +123,5 @@ def reimport_project(path, uuid): def update_project(path, uuid): - dl.update(os.path.join(path, "projects", uuid), how='merge', follow='parentds') - reimport_project(path, uuid) + dl.update(how='merge', follow='sibling', dataset=os.path.join(path, "projects", uuid)) + # reimport_project(path, uuid)