diff options
| author | Aaron LI <aly@aaronly.me> | 2019-01-26 15:59:27 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2019-01-26 15:59:27 +0800 |
| commit | b52e998decef6daa6eff053f7659e8e4d132a036 (patch) | |
| tree | 5ca351a281ed01ec940b6da2209eef7f1aa92409 /fg21sim/extragalactic/clusters | |
| parent | b0c8f1de53249964d00602bea81dcf55dfc7a1f6 (diff) | |
| download | fg21sim-b52e998decef6daa6eff053f7659e8e4d132a036.tar.bz2 | |
clusters/halo: Rename _merger() to _merger_event()
Diffstat (limited to 'fg21sim/extragalactic/clusters')
| -rw-r--r-- | fg21sim/extragalactic/clusters/halo.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py index 458c1d0..669f46e 100644 --- a/fg21sim/extragalactic/clusters/halo.py +++ b/fg21sim/extragalactic/clusters/halo.py @@ -790,7 +790,7 @@ class RadioHaloAM(RadioHalo1M): idx = self._merger_idx(t) return self.age_merger[idx] - def _merger(self, t): + def _merger_event(self, t): """ Return the merger event at cosmic time ``t``. """ @@ -811,7 +811,7 @@ class RadioHaloAM(RadioHalo1M): if t >= self.age_obs: return self.M_obs else: - merger = self._merger(t) + merger = self._merger_event(t) return (merger["M_main"] + merger["M_sub"]) def mass_sub(self, t): @@ -819,7 +819,7 @@ class RadioHaloAM(RadioHalo1M): The mass of the sub cluster at the given (cosmic) time. Unit: [Msun] """ - merger = self._merger(t) + merger = self._merger_event(t) return merger["M_sub"] def mass_main(self, t): @@ -838,7 +838,7 @@ class RadioHaloAM(RadioHalo1M): The mass of the main cluster. Unit: [Msun] """ - merger1 = self._merger(t) + merger1 = self._merger_event(t) idx1 = merger1["idx"] mass1 = merger1["M_main"] t1 = merger1["age"] |