diff options
Diffstat (limited to 'fg21sim/extragalactic/clusters/halo.py')
| -rw-r--r-- | fg21sim/extragalactic/clusters/halo.py | 5 | 
1 files changed, 4 insertions, 1 deletions
| diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py index 0881a88..f7ec54b 100644 --- a/fg21sim/extragalactic/clusters/halo.py +++ b/fg21sim/extragalactic/clusters/halo.py @@ -19,6 +19,7 @@ import scipy.integrate  import scipy.optimize  from .cosmology import Cosmology +from .formation import ClusterFormation  from .solver import FokkerPlanckSolver  from .units import (Units as AU, UnitConversions as AUC, Constants as AC) @@ -100,7 +101,9 @@ class HaloSingle:          Simulate the merging history of the cluster using the extended          Press-Schechter formalism.          """ -        raise NotImplementedError +        self.formation = ClusterFormation(self.M0, self.configs) +        self.mtree = self.formation.simulate_mergertree() +        return self.mtree      def calc_electron_spectrum(self):          """ | 
