From 41072ea1f2bb1c9d1d1e8131f13d53e516c99664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Sierro?= Date: Mon, 24 Jul 2023 12:04:12 +0200 Subject: [PATCH] moved C_to_A method --- src/scgenerator/const.py | 52 -------------------------------- src/scgenerator/physics/fiber.py | 8 ----- src/scgenerator/physics/pulse.py | 8 +++++ 3 files changed, 8 insertions(+), 60 deletions(-) diff --git a/src/scgenerator/const.py b/src/scgenerator/const.py index 4a2e3af..1dc33df 100644 --- a/src/scgenerator/const.py +++ b/src/scgenerator/const.py @@ -26,58 +26,6 @@ Z_FN = "z.npy" PARAM_FN = "params.toml" PARAM_SEPARATOR = " " -VALID_VARIABLE = { - "dispersion_file", - "prev_data_dir", - "field_file", - "loss_file", - "A_eff_file", - "beta2_coefficients", - "gamma", - "pitch", - "pitch_ratio", - "effective_mode_diameter", - "core_radius", - "model", - "capillary_num", - "capillary_radius", - "capillary_thickness", - "capillary_spacing", - "capillary_resonance_strengths", - "capillary_resonance_max_order", - "capillary_nested", - "he_mode", - "fit_parameters", - "input_transmission", - "n2", - "pressure", - "temperature", - "gas_name", - "plasma_density", - "peak_power", - "mean_power", - "peak_power", - "energy", - "quantum_noise", - "shape", - "wavelength", - "intensity_noise", - "width", - "t0", - "soliton_num", - "raman_type", - "tolerated_error", - "photoionization", - "step_size", - "interpolation_degree", - "ideal_gas", - "length", - "integration_scheme", - "num", -} - -INVALID_VARIABLE = {"repeat"} - MANDATORY_PARAMETERS = [ "name", diff --git a/src/scgenerator/physics/fiber.py b/src/scgenerator/physics/fiber.py index 7610c65..04a90c1 100644 --- a/src/scgenerator/physics/fiber.py +++ b/src/scgenerator/physics/fiber.py @@ -122,14 +122,6 @@ def D_to_beta2(D, wl_for_disp): return -(wl_for_disp**2) / (pipi * c) * D -def A_to_C(A: np.ndarray, A_eff_arr: np.ndarray) -> np.ndarray: - return (A_eff_arr / A_eff_arr[0]) ** (-1 / 4) * A - - -def C_to_A(C: np.ndarray, A_eff_arr: np.ndarray) -> np.ndarray: - return (A_eff_arr / A_eff_arr[0]) ** (1 / 4) * C - - def plasma_dispersion(wl_for_disp, number_density, simple=False): """computes dispersion (beta2) for constant plasma diff --git a/src/scgenerator/physics/pulse.py b/src/scgenerator/physics/pulse.py index d3b9167..2d702b0 100644 --- a/src/scgenerator/physics/pulse.py +++ b/src/scgenerator/physics/pulse.py @@ -510,6 +510,14 @@ def finalize_pulse( return np.sqrt(input_transmission) * pre_field_0 * ratio +def A_to_C(A: np.ndarray, A_eff_arr: np.ndarray) -> np.ndarray: + return (A_eff_arr / A_eff_arr[0]) ** (-1 / 4) * A + + +def C_to_A(C: np.ndarray, A_eff_arr: np.ndarray) -> np.ndarray: + return (A_eff_arr / A_eff_arr[0]) ** (1 / 4) * C + + def mean_phase(spectra): """computes the mean phase of spectra Parameter