From 015655947c99f69944143ab2f40b4845bba69c63 Mon Sep 17 00:00:00 2001
From: Aaron LI <aly@aaronly.me>
Date: Thu, 19 Oct 2017 23:17:55 +0800
Subject: clusters/halo: Add "kT_obs" and "tback_merger" properties

---
 fg21sim/extragalactic/clusters/halo.py | 17 ++++++++++++++++-
 fg21sim/extragalactic/clusters/main.py |  4 +++-
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'fg21sim/extragalactic')

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
@@ -164,6 +164,14 @@ class RadioHalo:
     def age_merger(self):
         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):
         """
@@ -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]
@@ -235,6 +243,13 @@ class RadioHalo:
         kT = helper.kT_cluster(mass, z=self.z_merger)
         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):
         """
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]
-- 
cgit v1.2.2