From ae1b6cec198ec5b1e564265c2628a254a87880af Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Fri, 2 Nov 2018 00:07:58 +0800 Subject: clusters/halo: Fix time argument in _velocity_turb() --- fg21sim/extragalactic/clusters/halo.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'fg21sim/extragalactic') diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py index 7343cb1..113e434 100644 --- a/fg21sim/extragalactic/clusters/halo.py +++ b/fg21sim/extragalactic/clusters/halo.py @@ -661,7 +661,7 @@ class RadioHalo: return helper.magnetic_field(mass=mass, z=z, configs=self.configs) @lru_cache() - def _gas_density_profile_f(self, t=None): + def _gas_density_profile_f(self, t): """ The gas density profile of the merged cluster. @@ -670,14 +670,13 @@ class RadioHalo: f(r) : function A function that calculates the gas density of unit [Msun/kpc^3]. """ + z = COSMO.redshift(t) M_main = self.mass_main(t) M_sub = self.mass_sub(t) - t_merger = self._merger_time(t) - z_merger = COSMO.redshift(t_merger) - return helper.calc_gas_density_profile(mass=M_main+M_sub, z=z_merger) + return helper.calc_gas_density_profile(mass=M_main+M_sub, z=z) @lru_cache() - def _velocity_turb(self, t=None): + def _velocity_turb(self, t): """ Calculate the turbulence velocity dispersion (i.e., turbulence Mach number). -- cgit v1.2.2