diff options
Diffstat (limited to 'fg21sim')
| -rw-r--r-- | fg21sim/extragalactic/clusters/halo.py | 17 | ||||
| -rw-r--r-- | fg21sim/extragalactic/clusters/main.py | 4 |
2 files changed, 19 insertions, 2 deletions
diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py index ab59db9..e34d91c 100644 --- a/fg21sim/extragalactic/clusters/halo.py +++ b/fg21sim/extragalactic/clusters/halo.py @@ -165,6 +165,14 @@ class RadioHalo: return COSMO.age(self.z_merger) @property + def tback_merger(self): + """ + The time from the observation (``z_obs``) back to the merger + (``z_merger``). + """ + return (self.age_obs - self.age_merger) # [Gyr] + + @property def time_crossing(self): """ The time duration of the sub-cluster crossing the main cluster, @@ -226,7 +234,7 @@ class RadioHalo: @property def kT_merger(self): """ - The cluster ICM mean temperature at z_merger when the merger + The cluster ICM mean temperature at ``z_merger`` when the merger begins. Unit: [keV] @@ -236,6 +244,13 @@ class RadioHalo: return kT @property + def kT_obs(self): + """ + The cluster ICM mean temperature at ``z_obs``. + """ + return helper.kT_cluster(self.M_obs, z=self.z_obs) # [keV] + + @property def injection_rate(self): """ The constant electron injection rate assumed. diff --git a/fg21sim/extragalactic/clusters/main.py b/fg21sim/extragalactic/clusters/main.py index e6c6154..7c85fa5 100644 --- a/fg21sim/extragalactic/clusters/main.py +++ b/fg21sim/extragalactic/clusters/main.py @@ -263,13 +263,15 @@ class GalaxyClusters: data = OrderedDict([ ("z0", halo.z_obs), ("M0", halo.M_obs), # [Msun] + ("kT0", halo.kT_obs), # [keV] ("lon", row.lon), # [deg] longitude ("lat", row.lat), # [deg] longitude ("felong", row.felong), # Fraction of elongation ("rotation", row.rotation), # [deg] ellipse rotation angle - ("z_merger", halo.z_merger), ("M_main", halo.M_main), # [Msun] ("M_sub", halo.M_sub), # [Msun] + ("z_merger", halo.z_merger), + ("tback_merger", halo.tback_merger), # [Gyr] ("time_crossing", halo.time_crossing), # [Gyr] ("radius", halo.radius), # [kpc] ("angular_radius", halo.angular_radius), # [arcsec] |