Merge pull request rpoleski#130 from rapoliveira/raphael-hack-sessions

Solved DeprecationWarnings from NumPy and SciPy

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):

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']

source/MulensModel/orbits/__init__.py

@@ -0,0 +1,3 @@
+from MulensModel.orbits.orbit import Orbit, OrbitCircular, OrbitEccentric
+
+__all__ = ['Orbit', 'OrbitCircular', 'OrbitEccentric']

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,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.simps(integrand[i], dx=dx_)
-        out = integrate.simps(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
 

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):

source/MulensModel/version.py

@@ -1 +1 @@
-__version__ = "2.21.2"
+__version__ = "2.21.3"