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

fixed plot cli; more params display infos

Browse Source
This commit is contained in:
Benoît Sierro
2021-10-19 09:23:44 +02:00
parent a9944b9fe8
commit cb19f65224
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,9 +365,9 @@ class Parameters(_AbstractParameters):
A_eff: float = Parameter(non_negative(float, int)) A_eff: float = Parameter(non_negative(float, int))
A_eff_file: str = Parameter(string) A_eff_file: str = Parameter(string)
numerical_aperture: float = Parameter(in_range_excl(0, 1)) 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)) 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)) he_mode: tuple[int, int] = Parameter(int_pair, default=(1, 1))
fit_parameters: tuple[int, int] = Parameter(float_pair, default=(0.08, 200e-9)) fit_parameters: tuple[int, int] = Parameter(float_pair, default=(0.08, 200e-9))
beta2_coefficients: Iterable[float] = Parameter(num_list) beta2_coefficients: Iterable[float] = Parameter(num_list)
@@ -375,11 +375,11 @@ class Parameters(_AbstractParameters):
model: str = Parameter( model: str = Parameter(
literal("pcf", "marcatili", "marcatili_adjusted", "hasan", "custom"), default="custom" 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_num: int = Parameter(positive(int))
capillary_radius: 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)) capillary_thickness: float = Parameter(in_range_excl(0, 1e-3), display_info=(1e6, "μm"))
capillary_spacing: float = Parameter(in_range_excl(0, 1e-3)) capillary_spacing: float = Parameter(in_range_excl(0, 1e-3), display_info=(1e6, "μm"))
capillary_resonance_strengths: Iterable[float] = Parameter( capillary_resonance_strengths: Iterable[float] = Parameter(
validator_list(type_checker(int, float, np.ndarray)) validator_list(type_checker(int, float, np.ndarray))
) )

6
src/scgenerator/scripts/__init__.py
View File

@@ -30,8 +30,10 @@ def plot_all(sim_dir: Path, limits: list[str], show=False, **opts):
for k, v in opts.items(): for k, v in opts.items():
if k in ["skip"]: if k in ["skip"]:
opts[k] = int(v) opts[k] = int(v)
if k in {"log", "renormalize"}: if v == "True":
opts[k] = True if v == "True" else False opts[k] = True
elif v == "False":
opts[k] = False
dir_list = simulations_list(sim_dir) dir_list = simulations_list(sim_dir)
if len(dir_list) == 0: if len(dir_list) == 0:
dir_list = [sim_dir] dir_list = [sim_dir]