Switch to linear interpolation of the inverse cumulative mass profile…

… to avoid sampling issues
jobovy · Oct 23, 2024 · e9440f6 · e9440f6
1 parent be8e740
commit e9440f6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/galpy/df/kingdf.py b/galpy/df/kingdf.py
@@ -81,7 +81,7 @@ def __init__(self, W0, M=1.0, rt=1.0, npt=1001, ro=None, vo=None):
         self._icmf = interpolate.InterpolatedUnivariateSpline(
             self._mass_scale * self._scalefree_kdf._cumul_mass / self.M,
             self._radius_scale * self._scalefree_kdf._r,
-            k=3,
+            k=1,
         )
         # Setup velocity DF interpolator for velocity sampling here
         self._rmin_sampling = 0.0

diff --git a/galpy/df/sphericaldf.py b/galpy/df/sphericaldf.py
@@ -454,7 +454,7 @@ def _make_cmf_interpolator(self):
         if numpy.isinf(self._rmax):
             xis = numpy.append(xis, 1)
             ms = numpy.append(ms, 1)
-        return scipy.interpolate.InterpolatedUnivariateSpline(ms, xis, k=3)
+        return scipy.interpolate.InterpolatedUnivariateSpline(ms, xis, k=1)
 
     def _sample_position_angles(self, n=1):
         """Generate spherical angle samples"""

diff --git a/tests/test_sphericaldf.py b/tests/test_sphericaldf.py
@@ -851,7 +851,7 @@ def test_osipkovmerritt_nfw_dens_massprofile():
         dfh = osipkovmerrittNFWdf(pot=pot, ra=ra)
         numpy.random.seed(10)
         samp = dfh.sample(n=100000)
-        tol = 5 * 1e-3
+        tol = 7 * 1e-3
         check_spherical_massprofile(
             samp, lambda r: pot.mass(r) / pot.mass(numpy.amax(samp.r())), tol, skip=1000
         )
@@ -1133,7 +1133,7 @@ def test_isotropic_nfw_dens_massprofile():
     dfp = isotropicNFWdf(pot=pot)
     numpy.random.seed(10)
     samp = dfp.sample(n=100000)
-    tol = 5 * 1e-3
+    tol = 7 * 1e-3
     check_spherical_massprofile(
         samp, lambda r: pot.mass(r) / pot.mass(numpy.amax(samp.r())), tol, skip=1000
     )