From ee5dcf3937741058c3f1926b444cf5cef719da82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Sierro?= Date: Wed, 30 Jun 2021 10:43:06 +0200 Subject: [PATCH] input_transmission wasn't considered with loaded fields --- src/scgenerator/physics/pulse.py | 5 ++++- src/scgenerator/scripts/__init__.py | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/scgenerator/physics/pulse.py b/src/scgenerator/physics/pulse.py index 1538b1e..aa37c29 100644 --- a/src/scgenerator/physics/pulse.py +++ b/src/scgenerator/physics/pulse.py @@ -239,7 +239,7 @@ def setup_custom_field(params: BareParams) -> bool: if params.prev_data_dir is not None: spec = io.load_last_spectrum(Path(params.prev_data_dir))[1] - field_0 = np.fft.ifft(spec) * np.sqrt(params.input_transmission) + field_0 = np.fft.ifft(spec) elif params.field_file is not None: field_data = np.load(params.field_file) field_interp = interp1d( @@ -258,6 +258,9 @@ def setup_custom_field(params: BareParams) -> bool: else: did_set = False + if did_set: + field_0 = field_0 * np.sqrt(params.input_transmission) + return did_set, width, peak_power, energy, field_0 diff --git a/src/scgenerator/scripts/__init__.py b/src/scgenerator/scripts/__init__.py index 4d211f6..41e8456 100644 --- a/src/scgenerator/scripts/__init__.py +++ b/src/scgenerator/scripts/__init__.py @@ -39,6 +39,7 @@ def plot_all(sim_dir: Path, limits: list[str]): file_name=p.parent / f"{pretty_format_from_file_name(p.name)} {left} {right} {unit}", ) + plt.close("all") def plot_init_field_spec(