From f4ca0350f024868a112b16adc34a2d80a277310f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Sierro?= Date: Wed, 27 Oct 2021 11:00:41 +0200 Subject: [PATCH] quick fixes for old version --- src/scgenerator/_utils/__init__.py | 2 +- src/scgenerator/_utils/parameter.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/scgenerator/_utils/__init__.py b/src/scgenerator/_utils/__init__.py index ea0184f..5c88046 100644 --- a/src/scgenerator/_utils/__init__.py +++ b/src/scgenerator/_utils/__init__.py @@ -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: 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))))) return Path(final_path), configs diff --git a/src/scgenerator/_utils/parameter.py b/src/scgenerator/_utils/parameter.py index 733939e..26ad2bd 100644 --- a/src/scgenerator/_utils/parameter.py +++ b/src/scgenerator/_utils/parameter.py @@ -880,10 +880,12 @@ class Configuration: self.z_num += config["z_num"] fiber_names.add(config["name"]) 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.fiber_paths.append( 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, prevent_overwrite=not self.overwrite, ) @@ -1027,7 +1029,7 @@ class Configuration: num = utils.find_last_spectrum_num(data_dir) if config_dict is None: try: - config_dict = utils._open_config(data_dir / PARAM_FN) + config_dict = utils.load_toml(data_dir / PARAM_FN) except FileNotFoundError: self.logger.warning(f"did not find {PARAM_FN!r} in {data_dir}") return self.State.ABSENT, 0