diff options
| author | Aaron LI <aly@aaronly.me> | 2017-08-29 20:53:31 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2017-08-29 20:53:31 +0800 |
| commit | fea0272a343ec700505654c6d042538d0db590f9 (patch) | |
| tree | 0693bf7fdbbfed64e802895bc4f6fa99fbb0f654 /fg21sim/extragalactic | |
| parent | 2379c84736f687e4ebc32583a3c2a34be0b88e98 (diff) | |
| download | fg21sim-fea0272a343ec700505654c6d042538d0db590f9.tar.bz2 | |
clusters/psformalism: Remove config "f_darkmatter"
Use "1 - baryon_fraction = 1 - Ob0/Om0" to replace "f_darkmatter".
Diffstat (limited to 'fg21sim/extragalactic')
| -rw-r--r-- | fg21sim/extragalactic/clusters/psformalism.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fg21sim/extragalactic/clusters/psformalism.py b/fg21sim/extragalactic/clusters/psformalism.py index f28c0d4..508d391 100644 --- a/fg21sim/extragalactic/clusters/psformalism.py +++ b/fg21sim/extragalactic/clusters/psformalism.py @@ -42,12 +42,11 @@ class PSFormalism: """ comp = "extragalactic/clusters" self.datafile = self.configs.get_path(comp+"/ps_data") - self.f_darkmatter = self.configs.getn(comp+"/f_darkmatter") self.Mmin_cluster = self.configs.getn(comp+"/mass_min") # [Msun] @property def Mmin_halo(self): - return self.Mmin_cluster * self.f_darkmatter + return self.Mmin_cluster * COSMO.darkmatter_fraction def _load_data(self, filepath=None): """ @@ -225,7 +224,7 @@ class PSFormalism: df = pd.DataFrame(np.column_stack([z_list, M_list]), columns=["z", "mass"]) - df["mass"] /= self.f_darkmatter + df["mass"] /= COSMO.darkmatter_fraction comment = [ "cluster number counts : %d" % counts, "z : redshift", |