diff options
| author | Aaron LI <aly@aaronly.me> | 2018-01-01 14:44:39 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2018-01-01 14:51:07 +0800 |
| commit | ee80b0578613410dc4b66487ec4dacd474b025d5 (patch) | |
| tree | d55d9c71d5bbcf791528a4b8affe05711397a71d /fg21sim/extragalactic/clusters/main.py | |
| parent | 8a6c73e48eb36f1aab223b9b2b29dc020d8571fb (diff) | |
| download | fg21sim-ee80b0578613410dc4b66487ec4dacd474b025d5.tar.bz2 | |
clusters/formation: Move parameter "ratio_major" to recent_major_merger()
* Simplify "max_merger" property to not check whether it is a major merger.
* Rename "max_merger" to "maximum_merger"
* Rename "simulate_mergertree()" to "simulate_mtree()"
Diffstat (limited to 'fg21sim/extragalactic/clusters/main.py')
| -rw-r--r-- | fg21sim/extragalactic/clusters/main.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fg21sim/extragalactic/clusters/main.py b/fg21sim/extragalactic/clusters/main.py index a8e0576..9d3810d 100644 --- a/fg21sim/extragalactic/clusters/main.py +++ b/fg21sim/extragalactic/clusters/main.py @@ -213,14 +213,13 @@ class GalaxyClusters: age0 = COSMO.age(z0) zmax = COSMO.redshift(age0 - self.time_traceback) clform = ClusterFormation(M0=M0, z0=z0, zmax=zmax, - ratio_major=self.ratio_major, merger_mass_min=self.merger_mass_min) - clform.simulate_mergertree(main_only=True) + clform.simulate_mtree(main_only=True) if self.use_max_merger: # NOTE: may be ``None`` due to no mergers occurred at all! - mmev = clform.max_merger + mmev = clform.maximum_merger else: - mmev = clform.recent_major_merger + mmev = clform.recent_major_merger(self.ratio_major) if mmev: mdata[i, :] = [mmev["M_main"], mmev["M_sub"], mmev["z"], mmev["age"]] |