From 00fccbb7e2491741f82e6603a37fe1a12af74c95 Mon Sep 17 00:00:00 2001
From: Aaron LI <aly@aaronly.me>
Date: Tue, 30 Oct 2018 21:30:30 +0800
Subject: clusters/halo: Update calculations of injection and halo radius

---
 fg21sim/extragalactic/clusters/halo.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'fg21sim/extragalactic/clusters/halo.py')

diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py
index eac9501..baa1a36 100644
--- a/fg21sim/extragalactic/clusters/halo.py
+++ b/fg21sim/extragalactic/clusters/halo.py
@@ -234,7 +234,7 @@ class RadioHalo:
         The estimated radius for the simulated radio halo.
         Unit: [kpc]
         """
-        return helper.radius_halo(self.M_obs, self.z_obs, configs=self.configs)
+        return self.injection_radius
 
     @property
     def angular_radius(self):
@@ -362,6 +362,18 @@ class RadioHalo:
             tau = tau_max
         return tau
 
+    @property
+    @lru_cache
+    def injection_radius(self):
+        """
+        The radius of the turbulence injection regions, and then the
+        injection scale: L_turb ~= 2*R_turb.
+        Unit: [kpc]
+        """
+        rs = helper.radius_stripping(self.M_main, self.M_sub, self.z_merger,
+                                     configs=self.configs)  # [kpc]
+        return self.f_lturb * rs
+
     @property
     @lru_cache()
     def injection_rate(self):
-- 
cgit v1.2.2