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

fix small bugs

Browse source
This commit is contained in:
Justus Kuhlmann 2025-04-07 19:59:26 +00:00
parent b51db7ae24
commit 77ee4993f0
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
corrlib/main.py
View file

@ -55,14 +55,17 @@ def update_project_data(db, uuid, prop, value = None):
def update_aliases(path, uuid, aliases): def update_aliases(path, uuid, aliases):
known_data = _project_lookup_by_id(path + "/backlogger.db", uuid)[0] known_data = _project_lookup_by_id(path + "/backlogger.db", uuid)[0]
known_aliases = known_data[1] known_aliases = known_data[1]
if aliases is None:
aliases = []
if known_aliases is None: if known_aliases is None:
print(f"Project {uuid} is already imported, no known aliases.") print(f"Project {uuid} is already imported, no known aliases.")
known_alias_list = []
else: else:
print(f"Project {uuid} is already imported, known by names: {known_aliases}") 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 new_alias_list = known_alias_list
for aka in aliases: for aka in aliases:
if aka not in known_aliases: if aka not in known_alias_list:
new_alias_list.append(aka) new_alias_list.append(aka)
if not len(new_alias_list) == len(known_alias_list): if not len(new_alias_list) == len(known_alias_list):
alias_str = list2str(new_alias_list) alias_str = list2str(new_alias_list)

7
corrlib/toml.py
View file

@ -89,7 +89,8 @@ def import_toml(path: str, file: str, copy_file: bool=True) -> None:
elif project['code'] == 'openQCD': elif project['code'] == 'openQCD':
param = openQCD.read_param(path, uuid, md['param_file']) param = openQCD.read_param(path, uuid, md['param_file'])
param['type'] = md['measurement'] 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']) write_measurement(path, ensemble, measurement, uuid, project['code'], md['param_file'])
if not os.path.exists(os.path.join(path, "toml_imports", uuid)): 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): def update_project(path, uuid):
dl.update(os.path.join(path, "projects", uuid), how='merge', follow='parentds') dl.update(how='merge', follow='sibling', dataset=os.path.join(path, "projects", uuid))
reimport_project(path, uuid) # reimport_project(path, uuid)