diff options
| author | Aaron LI <aly@aaronly.me> | 2019-01-27 18:45:52 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2019-01-27 18:45:52 +0800 |
| commit | 9345edf472e42e86ec1504737eaf5b133552aa4b (patch) | |
| tree | 330faecd73d1f1d401b7fd72105024d4eb8e6d07 /fg21sim/extragalactic/clusters | |
| parent | 4cf96fd4c488af333db25f926ca6ed2da92adaf1 (diff) | |
| download | fg21sim-9345edf472e42e86ec1504737eaf5b133552aa4b.tar.bz2 | |
clusters/halo: Tweak radius_turb() calculation
Diffstat (limited to 'fg21sim/extragalactic/clusters')
| -rw-r--r-- | fg21sim/extragalactic/clusters/halo.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py index 4b40e35..7067330 100644 --- a/fg21sim/extragalactic/clusters/halo.py +++ b/fg21sim/extragalactic/clusters/halo.py @@ -220,9 +220,8 @@ class RadioHalo1M: def radius_turb(self, t_merger): """ The radius of the turbulence region, which is estimated as the - stripping radius ``r_s`` of the sub-cluster if ``r_s`` is larger - than the core radius ``r_c`` of the main cluster, otherwise, as - ``r_c``. + sum of stripping radius ``r_s`` of the sub-cluster and the core + radius ``r_c`` of the main cluster. Unit: [kpc] """ @@ -231,7 +230,7 @@ class RadioHalo1M: M_main = self.mass_main(t_merger) r_s = self.radius_strip(t_merger) r_c = self.f_rc * helper.radius_virial(M_main, z) - return max([r_s, r_c]) + return r_s + r_c @lru_cache() def duration_turb(self, t_merger): |