dedebenui/scgenerator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quick fixes for old version

Browse Source
This commit is contained in:
Benoît Sierro
2021-10-27 11:00:41 +02:00
parent a608970370
commit f4ca0350f0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/scgenerator/_utils/__init__.py
View File

@@ -202,7 +202,7 @@ def load_config_sequence(path: os.PathLike) -> tuple[Path, list[dict[str, Any]]]
): ):
if len(common := root_vary.keys() & first_vary.keys()) != 0: if len(common := root_vary.keys() & first_vary.keys()) != 0:
raise ValueError(f"These variable keys are specified twice : {common!r}") raise ValueError(f"These variable keys are specified twice : {common!r}")
configs[0] |= {k: v for k, v in loaded_config.items() if k != "variable"} # configs[0] |= {k: v for k, v in loaded_config.items() if k != "variable"}
configs[0]["variable"].append(dict(num=list(range(configs[0].get("repeat", 1))))) configs[0]["variable"].append(dict(num=list(range(configs[0].get("repeat", 1)))))
return Path(final_path), configs return Path(final_path), configs

6
src/scgenerator/_utils/parameter.py
View File

@@ -880,10 +880,12 @@ class Configuration:
self.z_num += config["z_num"] self.z_num += config["z_num"]
fiber_names.add(config["name"]) fiber_names.add(config["name"])
vary_dict_list: list[dict[str, list]] = config.pop("variable") vary_dict_list: list[dict[str, list]] = config.pop("variable")
if len(vary_dict_list) > 1:
vary_dict_list = [d for d in vary_dict_list if len(d) > 0]
self.variationer.append(vary_dict_list) self.variationer.append(vary_dict_list)
self.fiber_paths.append( self.fiber_paths.append(
utils.ensure_folder( utils.ensure_folder(
self.final_path / fiber_folder(i, self.name, config["name"]), self.final_path / fiber_folder(i, self.name, Path(config["name"]).name),
mkdir=False, mkdir=False,
prevent_overwrite=not self.overwrite, prevent_overwrite=not self.overwrite,
) )
@@ -1027,7 +1029,7 @@ class Configuration:
num = utils.find_last_spectrum_num(data_dir) num = utils.find_last_spectrum_num(data_dir)
if config_dict is None: if config_dict is None:
try: try:
config_dict = utils._open_config(data_dir / PARAM_FN) config_dict = utils.load_toml(data_dir / PARAM_FN)
except FileNotFoundError: except FileNotFoundError:
self.logger.warning(f"did not find {PARAM_FN!r} in {data_dir}") self.logger.warning(f"did not find {PARAM_FN!r} in {data_dir}")
return self.State.ABSENT, 0 return self.State.ABSENT, 0