From 34d7800441d6cd3ac0b5818d87425349676e6cfe Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Sat, 6 Jan 2018 13:20:12 +0800 Subject: clusters/halo: fix _is_turb_active() bool condition --- fg21sim/extragalactic/clusters/halo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fg21sim/extragalactic') diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py index 3ada79a..2cd905b 100644 --- a/fg21sim/extragalactic/clusters/halo.py +++ b/fg21sim/extragalactic/clusters/halo.py @@ -711,8 +711,8 @@ class RadioHalo: if t < self.age_begin: return False t_merger = self._merger_time(t) - t_turb = self.time_turbulence(t=t_merger) - if (t >= t_merger) or (t <= t_merger + t_turb): + t_turb = self.time_turbulence(t_merger) + if (t >= t_merger) and (t <= t_merger + t_turb): return True else: return False -- cgit v1.2.2