aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2018-12-22 23:46:45 +0800
committerAaron LI <aly@aaronly.me>2018-12-22 23:46:45 +0800
commit18a2daa85bab74717fa58cc0d0d9902d7f715a3b (patch)
tree348f5978542fb0815cca7a4949ac1a72ba941fef
parent1947fffba78c7b287594851c99cbd0dff4d22bfa (diff)
downloadfg21sim-18a2daa85bab74717fa58cc0d0d9902d7f715a3b.tar.bz2
clusters/halo: Minor tweaks
-rw-r--r--fg21sim/extragalactic/clusters/halo.py22
1 files changed, 10 insertions, 12 deletions
diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py
index e1e5e2e..b9b99aa 100644
--- a/fg21sim/extragalactic/clusters/halo.py
+++ b/fg21sim/extragalactic/clusters/halo.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2018 Weitian LI <weitian@aaronly.me>
+# Copyright (c) 2017-2018 Weitian LI <wt@liwt.net>
# MIT license
"""
@@ -124,12 +124,10 @@ class RadioHalo:
The halo radius
Unit: [kpc]
gamma : 1D float `~numpy.ndarray`
- The Lorentz factors of the adopted logarithmic grid to solve the
- equation.
+ The Lorentz factors of the adopted logarithmic grid to solve the equation.
_acceleration_disabled : bool
Whether the turbulence acceleration is intentionally disabled?
"""
- # Component name
compID = "extragalactic/halos"
name = "giant radio halos"
@@ -235,14 +233,6 @@ class RadioHalo:
"""
return helper.radius_virial(mass=self.M_obs, z=self.z_obs)
- @property
- def radius(self):
- """
- The estimated radius of the simulated radio halo.
- Unit: [kpc]
- """
- return self.radius_turbulence(self.age_merger) * self.f_radius
-
@lru_cache()
def radius_turbulence(self, t):
"""
@@ -270,6 +260,14 @@ class RadioHalo:
return helper.radius_stripping(M_main, M_sub, z, configs=self.configs)
@property
+ def radius(self):
+ """
+ The estimated radius of the simulated radio halo.
+ Unit: [kpc]
+ """
+ return self.radius_turbulence(self.age_merger) * self.f_radius
+
+ @property
def angular_radius(self):
"""
The angular radius of the radio halo.