Minor cleanups

2 files changed, 24 insertions, 13 deletions

diff --git a/fg21sim/configs/20-extragalactic.conf.spec b/fg21sim/configs/20-extragalactic.conf.spec
index 8749c67..44fb1ca 100644
--- a/fg21sim/configs/20-extragalactic.conf.spec
+++ b/fg21sim/configs/20-extragalactic.conf.spec
@@ -10,12 +10,13 @@
 
 
 [extragalactic]
-
+  #
   # Press-Schechter formalism to determine the dark matter halos
   # distribution with respect to masses and redshifts, from which
   # to further determine the total number of halos within a sky
   # patch and to sample the masses and redshifts for each halo.
   # NOTE: only consider the *dark matter* mass within the halo!
+  #
   [[psformalism]]
   # The model of the fitting function for halo mass distribution
   # For all models and more details:
@@ -52,9 +53,12 @@
   #   Unit: [Msun] (the little "h" is folded into the values)
   dndlnm_outfile = string(default=None)
 
+
+  #
   # Extended emissions from the clusters of galaxies
   # The configurations in this ``[[clusters]]`` section may also be
   # used by the following ``[[halos]]`` section.
+  #
   [[clusters]]
   # Output CSV file of the clusters catalog containing the simulated
   # mass, redshift, position, shape, and the recent major merger info.
@@ -148,20 +152,21 @@
   output_dir = string(default=None)
 
 
-  # Giant radio halos for clusters with recent major mergers
+  #
+  # Giant radio halos
+  #
   [[halos]]
+  # A custom parameter to tune the turbulent acceleration timescale.
+  # NOTE: The smaller this parameter, the shorter the acceleration
+  #       timescale, therefore more efficient acceleration.
+  f_acc = float(default=1.0, min=0.1, max=10)
+
   # The turbulence is generally injected at the cluster center during
   # a merger.  This option parameterize the turbulence injection scale
-  # to be a fraction of the virial radius of the (main) cluster, which
-  # is also used to determine the radio halo radius.
+  # to be a fraction of the virial radius of the cluster, which is also
+  # used to determine the radio halo size.
   f_lturb = float(default=0.33, min=0.1, max=1.0)
 
-  # The custom option to tune the turbulent acceleration timescale, which
-  # controls the relativistic particle acceleration efficiencies.
-  # NOTE: The smaller this parameter, the shorter the acceleration
-  #       timescale, therefore the more efficient the turbulent acceleration.
-  f_acc = float(default=1.5, min=0.1, max=10)
-
   # The fraction of cluster thermal energy originating from turbulent
   # dissipation, which describes the turbulence intensity in the ICM,
   # and determines its Mach number.
@@ -207,7 +212,9 @@
   time_init = float(default=0.6, min=0)
 
 
+  #
   # Extragalactic point sources
+  #
   [[pointsources]]
   # Output directory to save the simulated catalog
   output_dir = string(default="PS_tables")
diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py
index 5df47cd..03e891c 100644
--- a/fg21sim/extragalactic/clusters/halo.py
+++ b/fg21sim/extragalactic/clusters/halo.py
@@ -90,7 +90,7 @@ class RadioHalo:
        considering only losses and constant injection, in order to derive
        an approximately steady electron spectrum for following use;
     5. Calculate the magnetic field from the cluster total mass (which
-       is assumed to be growth linearly from M_main+M_sub to M_obs);
+       is assumed to be growth linearly from M_main to M_obs);
     6. Calculate the energy losses for the coefficients of Fokker-Planck
        equation;
     7. Solve the Fokker-Planck equation to derive the relativistic
@@ -789,8 +789,12 @@ class RadioHalo:
 
         NOTE
         ----
-        We assume that the main cluster grows (i.e., gains mass) linearly
-        in time from (M_main, z_merge) to (M_obs, z_obs).
+        Since we currently only consider the last major merger event,
+        there may be a long time between ``z_merger`` and ``z_obs``.
+        So we assume that the main cluster grows linearly in time from
+        (M_main, z_merger) to (M_obs, z_obs).
+
+        TODO: consider the full merging history.
 
         Parameters
         ----------