aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2017-12-30 20:52:30 +0800
committerAaron LI <aly@aaronly.me>2017-12-30 20:52:30 +0800
commit78570cb9021512ae437940b8592dba233968f5cd (patch)
tree36224ac69d6baa2e94e41c6a2d563a37c0bc4b93
parent4b4103c9f44bce064d0f02bef1e997286bb6a7ef (diff)
downloadfg21sim-78570cb9021512ae437940b8592dba233968f5cd.tar.bz2
Minor cleanups
-rw-r--r--fg21sim/configs/20-extragalactic.conf.spec4
-rw-r--r--fg21sim/extragalactic/clusters/main.py8
2 files changed, 6 insertions, 6 deletions
diff --git a/fg21sim/configs/20-extragalactic.conf.spec b/fg21sim/configs/20-extragalactic.conf.spec
index 7debd75..8749c67 100644
--- a/fg21sim/configs/20-extragalactic.conf.spec
+++ b/fg21sim/configs/20-extragalactic.conf.spec
@@ -177,7 +177,7 @@
# Electron injection, which is assumed to have a constant injection
# rate and a power-law spectrum.
- injection_index = float(default=2.3, min=2.1, max=3.5)
+ injection_index = float(default=2.3, min=2.1, max=3.0)
# Minimum and maximum Lorentz factor (i.e., energy) of the relativistic
# electron spectrum.
@@ -185,7 +185,7 @@
gamma_max = float(default=1e5)
# Number of cells on the logarithmic momentum grid used to solve the
# Fokker-Planck equation.
- gamma_np = integer(default=200, min=100)
+ gamma_np = integer(default=200)
# Number of cells used as the buffer regions near both the lower
# and upper boundaries, within which the values will be replaced by
diff --git a/fg21sim/extragalactic/clusters/main.py b/fg21sim/extragalactic/clusters/main.py
index b6b5222..c441977 100644
--- a/fg21sim/extragalactic/clusters/main.py
+++ b/fg21sim/extragalactic/clusters/main.py
@@ -230,10 +230,10 @@ class GalaxyClusters:
"rmm_z", "rmm_age"])
self.catalog = self.catalog.join(mdf, how="outer")
self.catalog_comment += [
- "rmm_mass1 : [Msun] main cluster mass of recent major/maximum merger",
- "rmm_mass2 : [Msun] sub cluster mass of recent major/maximum merger",
- "rmm_z : redshift of the recent major/maximum merger",
- "rmm_age : [Gyr] cosmic age at the recent major/maximum merger",
+ "rmm_mass1: [Msun] main cluster mass of recent major/max merger",
+ "rmm_mass2: [Msun] sub cluster mass of recent major/max merger",
+ "rmm_z: redshift of the recent major/maximum merger",
+ "rmm_age: [Gyr] cosmic age at the recent major/maximum merger",
]
logger.info("Simulated and identified recent major/maximum mergers.")
if not self.use_max_merger: