diff options
| author | Aaron LI <aly@aaronly.me> | 2018-01-01 23:02:13 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2018-01-01 23:02:13 +0800 |
| commit | 925d4a2e42601db7fef20b13ac0238478b51bd66 (patch) | |
| tree | d4f867904956cd40ebd5eb6d50bcb82b0af46dfd /fg21sim/extragalactic/clusters/main.py | |
| parent | a543598a41af2b1488d59b57a0960e7261b37051 (diff) | |
| download | fg21sim-925d4a2e42601db7fef20b13ac0238478b51bd66.tar.bz2 | |
clusters/mergertree: add param mtree to maximum_merger and recent_major_merger
Diffstat (limited to 'fg21sim/extragalactic/clusters/main.py')
| -rw-r--r-- | fg21sim/extragalactic/clusters/main.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fg21sim/extragalactic/clusters/main.py b/fg21sim/extragalactic/clusters/main.py index 9d3810d..b704938 100644 --- a/fg21sim/extragalactic/clusters/main.py +++ b/fg21sim/extragalactic/clusters/main.py @@ -217,9 +217,9 @@ class GalaxyClusters: clform.simulate_mtree(main_only=True) if self.use_max_merger: # NOTE: may be ``None`` due to no mergers occurred at all! - mmev = clform.maximum_merger + mmev = clform.maximum_merger() else: - mmev = clform.recent_major_merger(self.ratio_major) + mmev = clform.recent_major_merger(ratio_major=self.ratio_major) if mmev: mdata[i, :] = [mmev["M_main"], mmev["M_sub"], mmev["z"], mmev["age"]] |