From 5b374a5756ad8625bf328925b09aa18aaa709d8a Mon Sep 17 00:00:00 2001 From: "Raphael A. P. Oliveira" Date: Fri, 8 Mar 2024 15:59:37 +0100 Subject: [PATCH 1/3] Solved two DeprecationWarning in automated tests, issue #127 --- source/MulensModel/pointlens.py | 5 ++--- source/MulensModel/tests/test_Model.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/source/MulensModel/pointlens.py b/source/MulensModel/pointlens.py index eb541465..118306e4 100644 --- a/source/MulensModel/pointlens.py +++ b/source/MulensModel/pointlens.py @@ -2,7 +2,6 @@ import warnings import numpy as np from math import sin, cos, sqrt, log10 -import scipy from scipy import integrate from scipy.interpolate import interp1d, interp2d from scipy.interpolate import RegularGridInterpolator as RGI @@ -477,8 +476,8 @@ def _LD_Lee09(self, u, rho, gamma, n_theta, n_u): integrand = self._integrand_Lee09_v2(temp, u, temp2, rho, gamma) dx = temp[:, 1] - temp[:, 0] for (i, dx_) in enumerate(dx): - integrand_values[i] = integrate.simps(integrand[i], dx=dx_) - out = integrate.simps(integrand_values, dx=theta[1] - theta[0]) + integrand_values[i] = integrate.simpson(integrand[i], dx=dx_) + out = integrate.simpson(integrand_values, dx=theta[1] - theta[0]) out *= 2. / (np.pi * rho**2) return out diff --git a/source/MulensModel/tests/test_Model.py b/source/MulensModel/tests/test_Model.py index 883736a1..d2d7361d 100644 --- a/source/MulensModel/tests/test_Model.py +++ b/source/MulensModel/tests/test_Model.py @@ -179,7 +179,7 @@ def test_BLPS_shear_active(): t = np.array([2456112.5]) data = mm.MulensData(data_list=[t, t*0.+16., t*0.+0.01]) magnification = model.get_magnification(data.time[0]) - assert not isclose(magnification, 4.691830781584699, abs_tol=1e-2) + assert not isclose(magnification[0], 4.691830781584699, abs_tol=1e-2) def test_BLPS_shear(): From c22c8e74d31a8cfd064dc2926bbb6671d778eedf Mon Sep 17 00:00:00 2001 From: "Raphael A. P. Oliveira" Date: Tue, 23 Apr 2024 12:43:41 +0200 Subject: [PATCH 2/3] Added try block to use scipy.integrate.simpson, issue #127 --- source/MulensModel/pointlens.py | 10 ++++++++-- source/MulensModel/version.py | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/source/MulensModel/pointlens.py b/source/MulensModel/pointlens.py index 118306e4..cced6175 100644 --- a/source/MulensModel/pointlens.py +++ b/source/MulensModel/pointlens.py @@ -476,8 +476,14 @@ def _LD_Lee09(self, u, rho, gamma, n_theta, n_u): integrand = self._integrand_Lee09_v2(temp, u, temp2, rho, gamma) dx = temp[:, 1] - temp[:, 0] for (i, dx_) in enumerate(dx): - integrand_values[i] = integrate.simpson(integrand[i], dx=dx_) - out = integrate.simpson(integrand_values, dx=theta[1] - theta[0]) + try: + integrand_values[i] = integrate.simpson(integrand[i], dx=dx_) + except AttributeError: + integrand_values[i] = integrate.simps(integrand[i], dx=dx_) + try: + out = integrate.simpson(integrand_values, dx=theta[1] - theta[0]) + except AttributeError: + out = integrate.simps(integrand_values, dx=theta[1] - theta[0]) out *= 2. / (np.pi * rho**2) return out diff --git a/source/MulensModel/version.py b/source/MulensModel/version.py index 6bd9995c..5d6a3ee9 100644 --- a/source/MulensModel/version.py +++ b/source/MulensModel/version.py @@ -1 +1 @@ -__version__ = "2.21.2" +__version__ = "2.21.3" From 2d7306afb19e62f1c3b74b58ab7c8722a5ebdf9c Mon Sep 17 00:00:00 2001 From: "Raphael A. P. Oliveira" Date: Tue, 23 Apr 2024 14:24:20 +0200 Subject: [PATCH 3/3] Removed import * from __init__ files, issue #67 --- source/MulensModel/__init__.py | 6 +++--- source/MulensModel/mulensobjects/__init__.py | 8 +++++--- source/MulensModel/orbits/__init__.py | 3 +++ source/MulensModel/trajectory.py | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/source/MulensModel/__init__.py b/source/MulensModel/__init__.py index 8ecf24d6..738d23f6 100644 --- a/source/MulensModel/__init__.py +++ b/source/MulensModel/__init__.py @@ -14,8 +14,8 @@ from MulensModel.model import Model from MulensModel.modelparameters import ModelParameters, which_parameters from MulensModel.mulensdata import MulensData -from MulensModel.mulensobjects import * -from MulensModel.orbits import * +from MulensModel.mulensobjects import Lens, Source, MulensSystem +from MulensModel import orbits from MulensModel.pointlens import PointLens, get_pspl_magnification from MulensModel.pointlenswithshear import PointLensWithShear from MulensModel.pointlensfinitesource import PointLensFiniteSource @@ -26,7 +26,7 @@ from .version import __version__ -__all__ = ['mulensobjects', 'MODULE_PATH', 'DATA_PATH'] +__all__ = ['mulensobjects', 'MODULE_PATH', 'DATA_PATH', 'BinaryLens'] MODULE_PATH = path.abspath(__file__) for i in range(3): diff --git a/source/MulensModel/mulensobjects/__init__.py b/source/MulensModel/mulensobjects/__init__.py index aa9334e7..2933cb92 100644 --- a/source/MulensModel/mulensobjects/__init__.py +++ b/source/MulensModel/mulensobjects/__init__.py @@ -1,3 +1,5 @@ -from MulensModel.mulensobjects.lens import * -from MulensModel.mulensobjects.source import * -from MulensModel.mulensobjects.mulenssystem import * +from MulensModel.mulensobjects.lens import Lens +from MulensModel.mulensobjects.source import Source +from MulensModel.mulensobjects.mulenssystem import MulensSystem + +__all__ = ['Lens', 'Source', 'MulensSystem'] diff --git a/source/MulensModel/orbits/__init__.py b/source/MulensModel/orbits/__init__.py index e69de29b..0e81b2f9 100644 --- a/source/MulensModel/orbits/__init__.py +++ b/source/MulensModel/orbits/__init__.py @@ -0,0 +1,3 @@ +from MulensModel.orbits.orbit import Orbit, OrbitCircular, OrbitEccentric + +__all__ = ['Orbit', 'OrbitCircular', 'OrbitEccentric'] diff --git a/source/MulensModel/trajectory.py b/source/MulensModel/trajectory.py index 26461b09..ddce3d10 100644 --- a/source/MulensModel/trajectory.py +++ b/source/MulensModel/trajectory.py @@ -7,7 +7,7 @@ from MulensModel import utils from MulensModel.modelparameters import ModelParameters from MulensModel.coordinates import Coordinates -from MulensModel.orbits.orbit import Orbit +from MulensModel.orbits import Orbit class Trajectory(object):