aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2019-01-10 00:04:14 +0800
committerAaron LI <aly@aaronly.me>2019-01-10 00:04:14 +0800
commit01bf43948b9e186953ff0fa3d2b76a8a958689ae (patch)
treed839bbbc4cd622bbf598f6e805a640b680784c14
parentbfff936eaf743e83cf018ecab6a2a7aa45d6ec27 (diff)
downloadfg21sim-01bf43948b9e186953ff0fa3d2b76a8a958689ae.tar.bz2
clusters/main: Minor cleanups
-rw-r--r--fg21sim/extragalactic/clusters/main.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/fg21sim/extragalactic/clusters/main.py b/fg21sim/extragalactic/clusters/main.py
index ba3ecf1..2a1a6b3 100644
--- a/fg21sim/extragalactic/clusters/main.py
+++ b/fg21sim/extragalactic/clusters/main.py
@@ -163,11 +163,12 @@ class GalaxyClusters:
("felong", felong[i]),
("rotation", rotation[i]),
])
+
self.comments += [
"age - [Gyr] cosmic age at z; ~ cluster age",
"lon, lat - [deg] longitudes and latitudes",
"felong - elongated fraction (= b/a)",
- "rotation - [deg] ellipse rotation angle",
+ "rotation - [deg] ellipse rotation angle",
]
logger.info("Added catalog items: age, lon, lat, felong, rotation.")
@@ -191,8 +192,7 @@ class GalaxyClusters:
ii = i + 1
if ii % 100 == 0:
logger.info("[%d/%d] %.1f%% ..." % (ii, num, 100*ii/num))
- z0, M0 = cdict["z"], cdict["mass"]
- age0 = COSMO.age(z0)
+ z0, M0, age0 = cdict["z"], cdict["mass"], cdict["age"]
zmax = COSMO.redshift(age0 - self.time_traceback)
clform = ClusterFormation(M0=M0, z0=z0, zmax=zmax,
merger_mass_min=self.merger_mass_min)