xp=np in kappa_s_scale_radius_and_core_radius_for_duffy

Author: Niek Wielders

autogalaxy/profiles/mass/dark/cnfw.py

@@ -12,7 +12,7 @@ def __init__(
         centre: Tuple[float, float] = (0.0, 0.0),
         kappa_s: float = 0.05,
         scale_radius: float = 1.0,
-        core_radius: float = 0.5,
+        core_radius: float = 0.01,
     ):
         """
                 Represents a spherical cored NFW density distribution

autogalaxy/profiles/mass/dark/mcr_util.py

@@ -58,7 +58,7 @@ def kappa_s_and_scale_radius_for_duffy(mass_at_200, redshift_object, redshift_so
 
     return kappa_s, scale_radius, radius_at_200
 
-def kappa_s_scale_radius_and_core_radius_for_duffy(mass_at_200, f_c, redshift_object, redshift_source):
+def kappa_s_scale_radius_and_core_radius_for_duffy(mass_at_200, f_c, redshift_object, redshift_source, xp=np):
     """
     Computes the AutoGalaxy cNFW parameters (kappa_s, scale_radius, core_radius) for an NFW halo of the given
     mass, enforcing the Penarrubia '12 mass-concentration relation.
@@ -87,7 +87,7 @@ def kappa_s_scale_radius_and_core_radius_for_duffy(mass_at_200, f_c, redshift_ob
     kpc_per_arcsec = cosmology.kpc_per_arcsec_from(redshift=redshift_object)
 
     radius_at_200 = (
-        mass_at_200 / (200.0 * cosmic_average_density * (4.0 * np.pi / 3.0))
+        mass_at_200 / (200.0 * cosmic_average_density * (4.0 * xp.pi / 3.0))
     ) ** (
         1.0 / 3.0
     )  # r200
@@ -97,11 +97,11 @@ def kappa_s_scale_radius_and_core_radius_for_duffy(mass_at_200, f_c, redshift_ob
     concentration = coefficient * (mass_at_200 / 2.952465309e12) ** (
         -0.084
     )  # mass-concentration relation. (Duffy+2008)
-    mass_concentration_relation = ((f_c**2 * np.log(1 + concentration / f_c) + (1 - 2 * f_c) * np.log(1 + concentration)) / (1 + f_c)**2
+    mass_concentration_relation = ((f_c**2 * xp.log(1 + concentration / f_c) + (1 - 2 * f_c) * xp.log(1 + concentration)) / (1 + f_c)**2
                                    - concentration / ((1+concentration) * (1-f_c))) #mass concentration relation (Penarrubia+2012)
 
     scale_radius_kpc = radius_at_200 / concentration  # scale radius in kpc
-    rho_0 = mass_at_200 / (4 * np.pi * scale_radius_kpc**3 * mass_concentration_relation)
+    rho_0 = mass_at_200 / (4 * xp.pi * scale_radius_kpc**3 * mass_concentration_relation)
     kappa_s = rho_0 * scale_radius_kpc / critical_surface_density  # kappa_s
     scale_radius = scale_radius_kpc / kpc_per_arcsec  # scale radius in arcsec
     core_radius = f_c * scale_radius # core radius in arcsec

test_autogalaxy/profiles/mass/dark/test_nfw_mcr.py

@@ -38,7 +38,7 @@ def test__mass_and_concentration_consistent_with_normal_nfw():
         redshift_profile=0.6, redshift_source=2.5, cosmology=cosmology
     )
 
-    # We uare using the NFWTruncatedSph to check the mass gives a conosistnt kappa_s, given certain radii.
+    # We are using the NFWTruncatedSph to check the mass gives a consistnt kappa_s, given certain radii.
 
     assert mass_at_200_via_kappa_s == mass_at_200_via_mass
     assert concentration_via_kappa_s == concentration_via_mass
@@ -53,6 +53,58 @@ def test__mass_and_concentration_consistent_with_normal_nfw():
 
     assert mp.scale_radius == pytest.approx(0.273382, 1.0e-4)
 
+# def test__mass_and_concentration_consistent_with_cored_nfw():
+#
+#     from autogalaxy.cosmology.model import FlatLambdaCDMWrap
+#
+#     cosmology = FlatLambdaCDMWrap(H0=70.0, Om0=0.3)
+#
+#     mp = ag.mp.cNFWMCRDuffySph(
+#         centre=(1.0, 2.0),
+#         mass_at_200=1.0e9,
+#         f_c=0.01,
+#         redshift_object=0.6,
+#         redshift_source=2.5,
+#     )
+#
+#     mass_at_200_via_mass = mp.mass_at_200_solar_masses(
+#         redshift_object=0.6, redshift_source=2.5, cosmology=cosmology
+#     )
+#     concentration_via_mass = mp.concentration(
+#         redshift_profile=0.6, redshift_source=2.5, cosmology=cosmology
+#     )
+#
+#     cnfw_kappa_s = ag.mp.cNFWSph(
+#         centre=(1.0, 2.0),
+#         kappa_s=mp.kappa_s,
+#         scale_radius=mp.scale_radius,
+#         core_radius=mp.core_radius,
+#     )
+#
+#     mass_at_200_via_kappa_s = cnfw_kappa_s.mass_at_200_solar_masses(
+#         redshift_object=0.6, redshift_source=2.5, cosmology=cosmology
+#     )
+#     concentration_via_kappa_s = cnfw_kappa_s.concentration(
+#         redshift_profile=0.6, redshift_source=2.5, cosmology=cosmology
+#     )
+#
+#     # We are using the NFWTruncatedSph to check the mass gives a consistnt kappa_s, given certain radii.
+#
+#     assert mass_at_200_via_kappa_s == mass_at_200_via_mass
+#     assert concentration_via_kappa_s == concentration_via_mass
+#
+#     assert mp.centre == (1.0, 2.0)
+#
+#     assert mp.axis_ratio() == 1.0
+#
+#     assert mp.angle() == 0.0
+#
+#     assert mp.inner_slope == 1.0
+#
+#     assert mp.scale_radius == pytest.approx(0.273382, 1.0e-4)
+#
+#     assert mp.core_radius == pytest.approx(0.00273382, 1.0e-6)
+
 
 def test__mass_and_concentration_consistent_with_normal_nfw__scatter_0():