From cb19f65224f8677c29907b2430b82a6bbce3e5c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Sierro?= Date: Tue, 19 Oct 2021 09:23:44 +0200 Subject: [PATCH] fixed plot cli; more params display infos --- src/scgenerator/_utils/parameter.py | 12 ++++++------ src/scgenerator/scripts/__init__.py | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/scgenerator/_utils/parameter.py b/src/scgenerator/_utils/parameter.py index b6181cd..5fa5bda 100644 --- a/src/scgenerator/_utils/parameter.py +++ b/src/scgenerator/_utils/parameter.py @@ -365,9 +365,9 @@ class Parameters(_AbstractParameters): A_eff: float = Parameter(non_negative(float, int)) A_eff_file: str = Parameter(string) numerical_aperture: float = Parameter(in_range_excl(0, 1)) - pitch: float = Parameter(in_range_excl(0, 1e-3)) + pitch: float = Parameter(in_range_excl(0, 1e-3), display_info=(1e6, "μm")) pitch_ratio: float = Parameter(in_range_excl(0, 1)) - core_radius: float = Parameter(in_range_excl(0, 1e-3)) + core_radius: float = Parameter(in_range_excl(0, 1e-3), display_info=(1e6, "μm")) he_mode: tuple[int, int] = Parameter(int_pair, default=(1, 1)) fit_parameters: tuple[int, int] = Parameter(float_pair, default=(0.08, 200e-9)) beta2_coefficients: Iterable[float] = Parameter(num_list) @@ -375,11 +375,11 @@ class Parameters(_AbstractParameters): model: str = Parameter( literal("pcf", "marcatili", "marcatili_adjusted", "hasan", "custom"), default="custom" ) - length: float = Parameter(non_negative(float, int)) + length: float = Parameter(non_negative(float, int), display_info=(1e2, "cm")) capillary_num: int = Parameter(positive(int)) - capillary_radius: float = Parameter(in_range_excl(0, 1e-3)) - capillary_thickness: float = Parameter(in_range_excl(0, 1e-3)) - capillary_spacing: float = Parameter(in_range_excl(0, 1e-3)) + capillary_radius: float = Parameter(in_range_excl(0, 1e-3), display_info=(1e6, "μm")) + capillary_thickness: float = Parameter(in_range_excl(0, 1e-3), display_info=(1e6, "μm")) + capillary_spacing: float = Parameter(in_range_excl(0, 1e-3), display_info=(1e6, "μm")) capillary_resonance_strengths: Iterable[float] = Parameter( validator_list(type_checker(int, float, np.ndarray)) ) diff --git a/src/scgenerator/scripts/__init__.py b/src/scgenerator/scripts/__init__.py index a54407d..8836843 100644 --- a/src/scgenerator/scripts/__init__.py +++ b/src/scgenerator/scripts/__init__.py @@ -30,8 +30,10 @@ def plot_all(sim_dir: Path, limits: list[str], show=False, **opts): for k, v in opts.items(): if k in ["skip"]: opts[k] = int(v) - if k in {"log", "renormalize"}: - opts[k] = True if v == "True" else False + if v == "True": + opts[k] = True + elif v == "False": + opts[k] = False dir_list = simulations_list(sim_dir) if len(dir_list) == 0: dir_list = [sim_dir]