From 18a2daa85bab74717fa58cc0d0d9902d7f715a3b Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Sat, 22 Dec 2018 23:46:45 +0800 Subject: clusters/halo: Minor tweaks --- fg21sim/extragalactic/clusters/halo.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'fg21sim/extragalactic') 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 +# Copyright (c) 2017-2018 Weitian LI # 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): """ @@ -269,6 +259,14 @@ class RadioHalo: M_sub = self.mass_sub(t) 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): """ -- cgit v1.2.2