From 48776204e2b6eefa86da11b4589e777eac109a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Sierro?= Date: Mon, 31 May 2021 18:40:43 +0200 Subject: [PATCH] fix mean power --- src/scgenerator/__init__.py | 2 +- src/scgenerator/initialize.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/scgenerator/__init__.py b/src/scgenerator/__init__.py index 845244b..827cad8 100644 --- a/src/scgenerator/__init__.py +++ b/src/scgenerator/__init__.py @@ -1,4 +1,4 @@ -from .initialize import compute_init_parameters +from .initialize import ParamSequence, RecoveryParamSequence, ContinuationParamSequence from .io import Paths, load_toml from .math import abs2, argclosest, span from .physics import fiber, materials, pulse, simulate, units diff --git a/src/scgenerator/initialize.py b/src/scgenerator/initialize.py index 55a84f7..7741bcb 100644 --- a/src/scgenerator/initialize.py +++ b/src/scgenerator/initialize.py @@ -605,6 +605,8 @@ def compute_init_parameters(config: Dict[str, Any]) -> Dict[str, Any]: params = _generate_sim_grid(params) # Initial field may influence the grid + if "mean_power" in params: + params["energy"] = params["mean_power"] / params["repetition_rate"] custom_field = setup_custom_field(params) if "step_size" in params: @@ -644,10 +646,7 @@ def compute_init_parameters(config: Dict[str, Any]) -> Dict[str, Any]: if "raman" in params["behaviors"]: params["hr_w"] = fiber.delayed_raman_w(params["t"], params["dt"], params["raman_type"]) - # PULSE - if "mean_power" in params: - params["energy"] = params["mean_power"] / params["repetition_rate"] - + # GENERIC PULSE if not custom_field: custom_field = False params = _update_pulse_parameters(params)