From 8387ab1ac665b0683881ad5dde21d246668afbe2 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Tue, 29 Jan 2019 20:38:29 +0800 Subject: clusters/psformalism: Count for dark matter fraction for M_min --- fg21sim/extragalactic/clusters/psformalism.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'fg21sim/extragalactic/clusters/psformalism.py') diff --git a/fg21sim/extragalactic/clusters/psformalism.py b/fg21sim/extragalactic/clusters/psformalism.py index d5c9fa5..328ba08 100644 --- a/fg21sim/extragalactic/clusters/psformalism.py +++ b/fg21sim/extragalactic/clusters/psformalism.py @@ -1,5 +1,5 @@ -# Copyright (c) 2017-2018 Weitian LI -# MIT license +# Copyright (c) 2017-2019 Weitian LI +# MIT License """ Press-Schechter (PS) formalism @@ -52,7 +52,8 @@ class PSFormalism: self.dndlnm_outfile = self.configs.get_path(comp+"/dndlnm_outfile") comp = "extragalactic/clusters" - self.Mmin = self.configs.getn(comp+"/mass_min") # [Msun] + fdm = 1 - COSMO.baryon_fraction + self.Mmin = self.configs.getn(comp+"/mass_min") * fdm # [Msun] self.boost = self.configs.getn(comp+"/boost") self.clobber = self.configs.getn("output/clobber") @@ -295,7 +296,8 @@ class PSFormalism: mass = np.array(mass_list) comment = [ "halo mass function model: %s" % self.hmf_model, - "cluster minimum mass: %.2e [Msun]" % self.Mmin, + "halo minimum mass (dark matter): %.2e [Msun]" % self.Mmin, + "dark matter fraction: %.2f" % (1-COSMO.baryon_fraction), "cluster counts: %d" % counts, "boost factor for cluster counts: %s" % self.boost, ] -- cgit v1.2.2