From b314fbe5084df28e719ec777d575882d625d8f72 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Wed, 3 Jan 2018 23:29:03 +0800 Subject: clusters/halo: delete radius_virial_{main,sub} and kT_sub properties --- fg21sim/extragalactic/clusters/halo.py | 17 ----------------- fg21sim/extragalactic/clusters/main.py | 3 --- 2 files changed, 20 deletions(-) diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py index 29262b8..a6dfbb3 100644 --- a/fg21sim/extragalactic/clusters/halo.py +++ b/fg21sim/extragalactic/clusters/halo.py @@ -231,17 +231,6 @@ class RadioHalo: """ return helper.radius_virial(mass=self.M_obs, z=self.z_obs) - @property - def radius_virial_main(self): - """ - The virial radius of the main cluster at ``z_merger``. - """ - return helper.radius_virial(mass=self.M_main, z=self.z_merger) - - @property - def radius_virial_sub(self): - return helper.radius_virial(mass=self.M_sub, z=self.z_merger) - @property @lru_cache() def radius(self): @@ -304,12 +293,6 @@ class RadioHalo: return helper.kT_cluster(mass=self.M_main, z=self.z_merger, configs=self.configs) - @property - @lru_cache() - def kT_sub(self): - return helper.kT_cluster(mass=self.M_sub, z=self.z_merger, - configs=self.configs) - @property @lru_cache() def kT_obs(self): diff --git a/fg21sim/extragalactic/clusters/main.py b/fg21sim/extragalactic/clusters/main.py index 6442e2a..fc5876f 100644 --- a/fg21sim/extragalactic/clusters/main.py +++ b/fg21sim/extragalactic/clusters/main.py @@ -276,9 +276,6 @@ class GalaxyClusters: ("M_sub", halo.M_sub), # [Msun] ("z_merger", halo.z_merger), ("kT_main", halo.kT_main), # [keV] main cluster kT at z_merger - ("kT_sub", halo.kT_sub), # [keV] sub-cluster kT at z_merger - ("Rvir_main", halo.radius_virial_main), # [kpc] at z_merger - ("Rvir_sub", halo.radius_virial_sub), # [kpc] at z_merger ("tback_merger", halo.tback_merger), # [Gyr] ("time_turbulence", halo.time_turbulence), # [Gyr] ("Rhalo", halo.radius), # [kpc] -- cgit v1.2.2