diff options
| author | Aaron LI <aly@aaronly.me> | 2018-01-06 13:20:12 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2018-01-06 13:20:12 +0800 |
| commit | 34d7800441d6cd3ac0b5818d87425349676e6cfe (patch) | |
| tree | 1f7c9c493f3216b221cb59ea00c3850e7ed6a637 | |
| parent | 93cacdb1f4c77052a52fed97d04f0504cc1ca1f5 (diff) | |
| download | fg21sim-34d7800441d6cd3ac0b5818d87425349676e6cfe.tar.bz2 | |
clusters/halo: fix _is_turb_active() bool condition
| -rw-r--r-- | fg21sim/extragalactic/clusters/halo.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |