From 9f6c4272c78e8376cff962ffc4b8b9f3d46b2ab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Sierro?= <benoitsierro@bluewin.ch>
Date: Tue, 16 Nov 2021 10:18:07 +0100
Subject: [PATCH] misc

---
 src/scgenerator/legacy.py   | 3 +++
 src/scgenerator/plotting.py | 5 +++--
 src/scgenerator/spectra.py  | 5 +++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/scgenerator/legacy.py b/src/scgenerator/legacy.py
index d33f3e5..b2d68e3 100644
--- a/src/scgenerator/legacy.py
+++ b/src/scgenerator/legacy.py
@@ -111,12 +111,15 @@ def translate_parameters(d: dict[str, Any]) -> dict[str, Any]:
         beta="beta2_coefficients",
         interp_range="interpolation_range",
     )
+    to_delete = ["dynamic_dispersion"]
     wl_limits_old = ["lower_wavelength_interp_limit", "upper_wavelength_interp_limit"]
     defaults_to_add = dict(repeat=1)
     new = {}
     if len(set(wl_limits_old) & d.keys()) == 2:
         new["interpolation_range"] = (d[wl_limits_old[0]], d[wl_limits_old[1]])
     for k, v in d.items():
+        if k in to_delete:
+            continue
         if k == "error_ok":
             new["tolerated_error" if d.get("adapt_step_size", True) else "step_size"] = v
         elif k == "behaviors":
diff --git a/src/scgenerator/plotting.py b/src/scgenerator/plotting.py
index 9c00139..f282637 100644
--- a/src/scgenerator/plotting.py
+++ b/src/scgenerator/plotting.py
@@ -17,7 +17,8 @@ from .math import abs2, span
 from .parameter import Parameters
 from .physics import pulse, units
 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]]
 NO_LIM = object()
@@ -1079,7 +1080,7 @@ def partial_plot(root: os.PathLike):
     spec_list = sorted(
         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)]
     raw_values = np.array([load_spectrum(s) for s in spec_list])
 
diff --git a/src/scgenerator/spectra.py b/src/scgenerator/spectra.py
index e8dc00c..31f39c5 100644
--- a/src/scgenerator/spectra.py
+++ b/src/scgenerator/spectra.py
@@ -19,7 +19,8 @@ from .plotting import (
     single_position_plot,
     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):
@@ -133,7 +134,7 @@ class SimulationSeries:
             break
         else:
             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.w = self.params.w
         if self.params.prev_data_dir is not None: