From 55483e5408ce122cf43059f53409c19ca7adeeb9 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Mon, 1 Jan 2018 23:27:48 +0800 Subject: Improve descriptions and minor cleanups --- fg21sim/extragalactic/clusters/formation.py | 9 ++++----- fg21sim/extragalactic/clusters/halo.py | 4 +--- fg21sim/extragalactic/clusters/main.py | 18 +++++++++--------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/fg21sim/extragalactic/clusters/formation.py b/fg21sim/extragalactic/clusters/formation.py index 524237c..7d7b9a2 100644 --- a/fg21sim/extragalactic/clusters/formation.py +++ b/fg21sim/extragalactic/clusters/formation.py @@ -172,16 +172,15 @@ class ClusterFormation: Parameters ---------- main_only : bool, optional - Whether to only trace the forming history of the main - halo/cluster. - (default: True) + Whether to only trace the forming history of the main cluster. + Default: True References: Ref.[randall2002],Sec.(3.1) """ logger.debug("Simulating cluster formation: " + "M0=%.3e[Msun] " % self.M0 + - "from z={:.3f} back to z={zmax} ...".format( - self.z0, zmax=self.zmax)) + "from z={z0:.3f} back to z={zmax} ...".format( + z0=self.z0, zmax=self.zmax)) self.main_only = main_only if main_only: logger.debug("Only trace the formation of the *main* cluster ...") diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py index 1da89b3..cd6b9bc 100644 --- a/fg21sim/extragalactic/clusters/halo.py +++ b/fg21sim/extragalactic/clusters/halo.py @@ -656,7 +656,7 @@ class RadioHalo: omega = np.pi * self.angular_radius**2 # [arcsec^2] if pixelsize and (omega < pixelsize**2): omega = pixelsize ** 2 # [arcsec^2] - logger.warning("Object size < 1 pixel; force to be 1 pixel!") + logger.warning("Halo size < 1 pixel; force to be 1 pixel!") Tb = Fnu_to_Tb(flux, omega, frequencies) # [K] return Tb @@ -801,8 +801,6 @@ class RadioHalo: 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 ---------- t : float diff --git a/fg21sim/extragalactic/clusters/main.py b/fg21sim/extragalactic/clusters/main.py index b704938..0251662 100644 --- a/fg21sim/extragalactic/clusters/main.py +++ b/fg21sim/extragalactic/clusters/main.py @@ -2,14 +2,14 @@ # MIT license """ -Simulate the extended radio emissions from galaxy clusters due to -merger-induced turbulence and/or shock accelerations, -e.g., (giant) radio halos, (elongated double) radio relics. +Simulate the diffuse radio emissions from galaxy clusters due to +merger-induced turbulence and/or shock accelerations, e.g., +(giant) radio halos, (elongated double) radio relics. NOTE ---- -There are other types of extended radio emissions not considered -yet, e.g., mini-halos, roundish radio relics, etc. +There are other types of diffuse radio emissions not considered +yet, e.g., mini-halos, roundish radio relics. """ import os @@ -36,13 +36,13 @@ logger = logging.getLogger(__name__) class GalaxyClusters: """ - Simulate the extended radio emissions from the galaxy clusters. + Simulate the diffuse radio emissions from the galaxy clusters. NOTE ---- - Currently, only the *giant radio halos* are considered, while - other types of extended emissions are missing, e.g., mini-halos, - elongated relics, roundish relics. + Currently only implement the *giant radio halos*, while other types + of diffuse emissions are missing, e.g., mini-halos, elongated relics, + roundish relics. Attributes ---------- -- cgit v1.2.2