From 46999f15f7bbf26250153ec2d4044d172ea928e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Sierro?= Date: Sat, 28 Aug 2021 14:15:10 +0200 Subject: [PATCH] miscelanious --- src/scgenerator/physics/fiber.py | 7 +++++++ src/scgenerator/physics/pulse.py | 6 ++---- src/scgenerator/physics/simulate.py | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/scgenerator/physics/fiber.py b/src/scgenerator/physics/fiber.py index c91a430..d8334ad 100644 --- a/src/scgenerator/physics/fiber.py +++ b/src/scgenerator/physics/fiber.py @@ -711,6 +711,13 @@ def compute_loss(params: BareParams) -> Optional[np.ndarray]: out = np.zeros_like(params.l) out[mask] = alpha return out + # else: + # return np.where( + # (params.l < params.lower_wavelength_interp_limit) + # | (params.l > params.upper_wavelength_interp_limit), + # 100, + # 0, + # ) return None diff --git a/src/scgenerator/physics/pulse.py b/src/scgenerator/physics/pulse.py index 7f9dab0..d1b086b 100644 --- a/src/scgenerator/physics/pulse.py +++ b/src/scgenerator/physics/pulse.py @@ -1019,10 +1019,8 @@ def rin_curve(spectra: np.ndarray) -> np.ndarray: rin_curve : np.ndarray RIN curve """ - spec2 = abs2(spectra) - # return np.std(spec, axis=0) / np.mean(spec, axis=0) - m = np.mean(spec2, axis=0) - return np.sqrt(np.mean((spec2 - m) ** 2)) / m + A2 = abs2(spectra) + return np.std(A2, axis=0) / np.mean(A2, axis=0) def measure_field(t: np.ndarray, field: np.ndarray) -> Tuple[float, float, float]: diff --git a/src/scgenerator/physics/simulate.py b/src/scgenerator/physics/simulate.py index a253cc0..b10298d 100644 --- a/src/scgenerator/physics/simulate.py +++ b/src/scgenerator/physics/simulate.py @@ -207,7 +207,7 @@ class RK4IP: return self.stored_spectra - def irun(self): + def irun(self) -> Generator[tuple[int, int, np.ndarray], None, None]: # Print introduction self.logger.debug(