From 5583181eb1842b79dd2d95d47d7b9036fadb0063 Mon Sep 17 00:00:00 2001 From: Xavier Audier Date: Tue, 17 Oct 2023 13:38:45 -0400 Subject: [PATCH 1/2] Fixes scipy factorial deprecated --- src/pynlo/media/fibers/calculators.py | 2 +- src/pynlo/media/fibers/fiber.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pynlo/media/fibers/calculators.py b/src/pynlo/media/fibers/calculators.py index ba1260d..fad816e 100644 --- a/src/pynlo/media/fibers/calculators.py +++ b/src/pynlo/media/fibers/calculators.py @@ -24,7 +24,7 @@ import numpy as np -from scipy.misc import factorial +from math import factorial from scipy import constants import matplotlib.pyplot as plt diff --git a/src/pynlo/media/fibers/fiber.py b/src/pynlo/media/fibers/fiber.py index 1471be8..f3060c4 100755 --- a/src/pynlo/media/fibers/fiber.py +++ b/src/pynlo/media/fibers/fiber.py @@ -24,7 +24,7 @@ import numpy as np import scipy.interpolate from pynlo.media.fibers.calculators import DTabulationToBetas -from scipy.misc import factorial +from math import factorial from scipy import constants from scipy.optimize import minimize from pynlo.util.pynlo_ffts import IFFT_t From 13dda3a53066b8ed6bf3f2e2ae6c082a16d9d35d Mon Sep 17 00:00:00 2001 From: Xavier Audier Date: Tue, 17 Oct 2023 13:39:01 -0400 Subject: [PATCH 2/2] Fixes numpy float deprecated --- src/pynlo/interactions/FourWaveMixing/SSFM.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pynlo/interactions/FourWaveMixing/SSFM.py b/src/pynlo/interactions/FourWaveMixing/SSFM.py index 91cc905..091a04e 100755 --- a/src/pynlo/interactions/FourWaveMixing/SSFM.py +++ b/src/pynlo/interactions/FourWaveMixing/SSFM.py @@ -524,7 +524,7 @@ def propagate(self, pulse_in, fiber, n_steps, output_power=None, reload_fiber_ea for i in range(n_steps): - print ("Step:", i, "Distance remaining:", fiber.length * (1 - np.float(i)/n_steps) ) + print ("Step:", i, "Distance remaining:", fiber.length * (1 - float(i)/n_steps) ) if reload_fiber_each_step: self.load_fiber_parameters(pulse_in, fiber, output_power, z=i*delta_z)