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

misc

Browse Source
This commit is contained in:
Benoît Sierro
2021-11-16 10:18:07 +01:00
parent 46102a03d9
commit 9f6c4272c7
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/scgenerator/legacy.py
View File

@@ -111,12 +111,15 @@ def translate_parameters(d: dict[str, Any]) -> dict[str, Any]:
beta="beta2_coefficients", beta="beta2_coefficients",
interp_range="interpolation_range", interp_range="interpolation_range",
) )
to_delete = ["dynamic_dispersion"]
wl_limits_old = ["lower_wavelength_interp_limit", "upper_wavelength_interp_limit"] wl_limits_old = ["lower_wavelength_interp_limit", "upper_wavelength_interp_limit"]
defaults_to_add = dict(repeat=1) defaults_to_add = dict(repeat=1)
new = {} new = {}
if len(set(wl_limits_old) & d.keys()) == 2: if len(set(wl_limits_old) & d.keys()) == 2:
new["interpolation_range"] = (d[wl_limits_old[0]], d[wl_limits_old[1]]) new["interpolation_range"] = (d[wl_limits_old[0]], d[wl_limits_old[1]])
for k, v in d.items(): for k, v in d.items():
if k in to_delete:
continue
if k == "error_ok": if k == "error_ok":
new["tolerated_error" if d.get("adapt_step_size", True) else "step_size"] = v new["tolerated_error" if d.get("adapt_step_size", True) else "step_size"] = v
elif k == "behaviors": elif k == "behaviors":

5
src/scgenerator/plotting.py
View File

@@ -17,7 +17,8 @@ from .math import abs2, span
from .parameter import Parameters from .parameter import Parameters
from .physics import pulse, units from .physics import pulse, units
from .physics.units import PlotRange, sort_axis from .physics.units import PlotRange, sort_axis
from .utils import load_spectrum from .utils import load_spectrum, load_toml
from .legacy import translate_parameters
RangeType = tuple[float, float, Union[str, Callable]] RangeType = tuple[float, float, Union[str, Callable]]
NO_LIM = object() NO_LIM = object()
@@ -1079,7 +1080,7 @@ def partial_plot(root: os.PathLike):
spec_list = sorted( spec_list = sorted(
path.glob(SPEC1_FN.format("*")), key=lambda el: int(re.search("[0-9]+", el.name)[0]) path.glob(SPEC1_FN.format("*")), key=lambda el: int(re.search("[0-9]+", el.name)[0])
) )
params = Parameters.load(path / "params.toml") params = Parameters(**translate_parameters(load_toml(path / "params.toml")))
params.z_targets = params.z_targets[: len(spec_list)] params.z_targets = params.z_targets[: len(spec_list)]
raw_values = np.array([load_spectrum(s) for s in spec_list]) raw_values = np.array([load_spectrum(s) for s in spec_list])

5
src/scgenerator/spectra.py
View File

@@ -19,7 +19,8 @@ from .plotting import (
single_position_plot, single_position_plot,
transform_2D_propagation, transform_2D_propagation,
) )
from .utils import load_spectrum, simulations_list from .utils import load_spectrum, simulations_list, load_toml
from .legacy import translate_parameters
class Spectrum(np.ndarray): class Spectrum(np.ndarray):
@@ -133,7 +134,7 @@ class SimulationSeries:
break break
else: else:
raise FileNotFoundError(f"No simulation in {path}") raise FileNotFoundError(f"No simulation in {path}")
self.params = Parameters.load(self.path / PARAM_FN) self.params = Parameters(**translate_parameters(load_toml(path / PARAM_FN)))
self.t = self.params.t self.t = self.params.t
self.w = self.params.w self.w = self.params.w
if self.params.prev_data_dir is not None: if self.params.prev_data_dir is not None: