minor refactoring, 3d pressure profile test

Author: jhod0

cluster_toolkit/pressure_profile.py

@@ -16,6 +16,7 @@
 `projected_P_BBPS_real` interpolates over a table of comoving distances to
 obtain a more precise answer.
 '''
+
 import numpy as np
 from scipy.integrate import quad
 import scipy.special as spec
@@ -34,14 +35,13 @@ def _rho_crit(z, omega_m):
     return 2.77536627e+11 * (omega_m * (1 + z)**3 + omega_lambda)
 
 
-def P_delta(M, z, omega_b, omega_m, delta=200):
+def R_delta(M, z, omega_m, delta=200):
     '''
-    The pressure amplitude of a halo:
-
-    :math:`P_{\\Delta} = G * M_{\\Delta} * \\Delta * \\rho_{crit}(z) \
-                * \\Omega_b / \\Omega_m / (2R_{\\Delta})`
+    The radius of a sphere of mass M (in Msun), which has a density `delta`
+    times the critical density of the universe.
 
-    See BBPS, section 4.1 for details.
+    :math:`R_{\\Delta} = \\Big(\\frac{3 M_{\\Delta}} \
+                                     {8 \\pi \\Delta \\rho_{crit}}\Big)^{1/3}`
 
     Args:
         M (float): Halo mass :math:`M_{\\Delta}`, in units of Msun.
@@ -50,21 +50,20 @@ def P_delta(M, z, omega_b, omega_m, delta=200):
         delta (float): The halo overdensity :math:`\\Delta`.
 
     Returns:
-        float: Pressure amplitude, in units of Msun h^{8/3} s^{-2} Mpc^{-1}.
+        float: Radius, in :math:`\\text{Mpc} h^\\frac{-2}{3}`.
     '''
-    # G = 4.51710305e-48 Mpc^3 Msun^{-1} s^{-2}
-    # (source: astropy's constants module and unit conversions)
-    return 4.51710305e-48 * M * delta * _rho_crit(z, omega_m) * \
-        omega_b / omega_m / 2 / R_delta(M, omega_m, z, delta)
+    volume = M / (delta * _rho_crit(z, omega_m))
+    return (3 * volume / (4 * np.pi))**(1./3)
 
 
-def R_delta(M, z, omega_m, delta=200):
+def P_delta(M, z, omega_b, omega_m, delta=200):
     '''
-    The radius of a sphere of mass M (in Msun), which has a density `delta`
-    times the critical density of the universe.
+    The pressure amplitude of a halo:
 
-    :math:`R_{\\Delta} = \\Big(\\frac{3 M_{\\Delta}} \
-                                     {8 \\pi \\Delta \\rho_{crit}}\Big)^{1/3}`
+    :math:`P_{\\Delta} = G * M_{\\Delta} * \\Delta * \\rho_{crit}(z) \
+                * \\Omega_b / \\Omega_m / (2R_{\\Delta})`
+
+    See BBPS, section 4.1 for details.
 
     Args:
         M (float): Halo mass :math:`M_{\\Delta}`, in units of Msun.
@@ -73,10 +72,12 @@ def R_delta(M, z, omega_m, delta=200):
         delta (float): The halo overdensity :math:`\\Delta`.
 
     Returns:
-        float: Radius, in :math:`\\text{Mpc} h^\\frac{-2}{3}`.
+        float: Pressure amplitude, in units of Msun h^{8/3} s^{-2} Mpc^{-1}.
     '''
-    volume = M / (delta * _rho_crit(z, omega_m))
-    return (3 * volume / (4 * np.pi))**(1./3)
+    # G = 4.51710305e-48 Mpc^3 Msun^{-1} s^{-2}
+    # (source: astropy's constants module and unit conversions)
+    return 4.51710305e-48 * M * delta * _rho_crit(z, omega_m) * \
+        (omega_b / omega_m) / (2 * R_delta(M, z, omega_m, delta))
 
 
 def P_simple_BBPS_generalized(x, M, z, P_0, x_c, beta,
@@ -114,8 +115,7 @@ def P_BBPS(r, M, z, omega_b, omega_m,
            params_P_0=(18.1, 0.154, -0.758),
            params_x_c=(0.497, -0.00865, 0.731),
            params_beta=(4.35, 0.0393, 0.415),
-           alpha=1,
-           gamma=-0.3,
+           alpha=1, gamma=-0.3,
            delta=200):
     '''
     The best-fit pressure profile presented in BBPS2.

docs/.gitignore

@@ -0,0 +1 @@
+api/