aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2019-01-18 00:01:25 +0800
committerAaron LI <aly@aaronly.me>2019-01-18 13:00:52 +0800
commit4a5cbc5147ae4b0330e3154d5e4dda38601ecadd (patch)
treef59f0751cb0f823171146fe358bed97cbb9fc59e
parent0abeded3cad5de40789c3d9bbe253aac6af8927f (diff)
downloadfg21sim-4a5cbc5147ae4b0330e3154d5e4dda38601ecadd.tar.bz2
Minor tweaks
-rw-r--r--fg21sim/configs/config.spec6
-rw-r--r--fg21sim/extragalactic/clusters/halo.py5
-rw-r--r--fg21sim/extragalactic/clusters/helper.py4
3 files changed, 8 insertions, 7 deletions
diff --git a/fg21sim/configs/config.spec b/fg21sim/configs/config.spec
index bf3285e..d580d3f 100644
--- a/fg21sim/configs/config.spec
+++ b/fg21sim/configs/config.spec
@@ -12,7 +12,7 @@ galactic/synchrotron = boolean(default=False)
galactic/freefree = boolean(default=False)
# Galactic supernova remnants emission
galactic/snr = boolean(default=False)
-# Extragalactic clusters of galaxies emission
+# Extragalactic clusters of galaxies emission
extragalactic/clusters = boolean(default=False)
@@ -440,8 +440,8 @@ stream = option("stderr", "stdout", "", default="stderr")
# Unit: [Gyr]
time_init = float(default=1.0, min=0)
- # The frequency and factor used to determine whether the radio halo is
- # genuine, i.e., the flux density at ``fiducial_freq`` is at least
+ # The frequency and factor used to determine the existence of the radio
+ # halo, i.e., the emissivity at ``fiducial_freq`` is at least
# ``fiducial_factor`` times the fiducial value.
# Unit: [MHz]
fiducial_freq = float(default=150.0)
diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py
index 4eb475d..c1f0946 100644
--- a/fg21sim/extragalactic/clusters/halo.py
+++ b/fg21sim/extragalactic/clusters/halo.py
@@ -254,7 +254,7 @@ class RadioHalo1M:
z = COSMO.redshift(t)
M_main = self.mass_main(t)
M_sub = self.mass_sub(t)
- return helper.radius_stripping(M_main, M_sub, z, configs=self.configs)
+ return helper.radius_stripping(M_main, M_sub, z, f_rc=self.f_rc)
def calc_radius(self):
"""
@@ -479,6 +479,7 @@ class RadioHalo1M:
factor : float
Acceleration factor of the flux.
"""
+ # NOTE: The emissivity is linearly proportional to 'B'.
haloem = HaloEmission(gamma=self.gamma, n_e=n_e, B=1)
em = haloem.calc_emissivity(self.fiducial_freq)
@@ -930,7 +931,7 @@ class RadioHalo:
"""
Simulate the radio halo properties for a galaxy cluster.
- This class is built upon the ``RadioHalo1M`` and ``RadioHaloAM`` and
+ This class is built upon the `~RadioHalo1M` and `~RadioHaloAM` and
is intended for use in the outside.
Parameters
diff --git a/fg21sim/extragalactic/clusters/helper.py b/fg21sim/extragalactic/clusters/helper.py
index 4d06ceb..e27d763 100644
--- a/fg21sim/extragalactic/clusters/helper.py
+++ b/fg21sim/extragalactic/clusters/helper.py
@@ -137,7 +137,7 @@ def radius_virial(mass, z=0.0):
return R_vir * AUC.cm2kpc # [kpc]
-def radius_stripping(M_main, M_sub, z, configs=CONFIGS):
+def radius_stripping(M_main, M_sub, z, f_rc=0.1):
"""
Calculate the stripping radius of the in-falling sub-cluster, which
is determined by the equipartition between the static and ram pressure.
@@ -162,7 +162,7 @@ def radius_stripping(M_main, M_sub, z, configs=CONFIGS):
rs = optimize.brentq(lambda r: f_rho_sub(r) - rhs,
a=0.1*r_vir, b=r_vir, xtol=1e-1)
except ValueError:
- rs = 0.1 * r_vir
+ rs = 2*f_rc * r_vir
return rs # [kpc]