From cb4cd8cc3d244d13b15f5cf8fb0a1d65746b11cc Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Sat, 22 Jul 2017 20:48:24 +0800 Subject: clusters: Rename "last major merger" to "recent major merger" Signed-off-by: Aaron LI --- fg21sim/extragalactic/clusters/formation.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'fg21sim/extragalactic/clusters/formation.py') diff --git a/fg21sim/extragalactic/clusters/formation.py b/fg21sim/extragalactic/clusters/formation.py index 3bb44a9..a036069 100644 --- a/fg21sim/extragalactic/clusters/formation.py +++ b/fg21sim/extragalactic/clusters/formation.py @@ -63,9 +63,9 @@ class ClusterFormation: ---------- mtree : `~MergerTree` Merging history of this cluster. - last_major_merger : dict, or None - An dictionary containing the properties of the found last/recent - major merger event, or None if not found. + recent_major_merger : dict, or None + An dictionary containing the properties of the found most recent + major merger event, or ``None`` if not found. """ def __init__(self, M0, z0, zmax=3.0, ratio_major=3.0, merger_mass_min=1e12): @@ -203,9 +203,9 @@ class ClusterFormation: return self.mtree @property - def last_major_merger(self): + def recent_major_merger(self): """ - Identify and return the last major merger event + Identify and return the most recent major merger event. Returns ------- -- cgit v1.2.2