diff options
| author | Aaron LI <aly@aaronly.me> | 2019-02-27 20:38:57 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2019-02-27 20:41:13 +0800 |
| commit | 35c980916a34bf4e35246090e8c6b9cf89141e97 (patch) | |
| tree | 97ad604ec1b9c02eef845ae8151c66070d40b4a8 | |
| parent | 0ca5a652fbf4be4515fec92ca2face5f6d178270 (diff) | |
| download | fg21sim-35c980916a34bf4e35246090e8c6b9cf89141e97.tar.bz2 | |
clusters/main: Do not calculate acceleration factor and genuine
A new method to determine the formation/genuineness of a radio halo will
be used.
| -rw-r--r-- | fg21sim/configs/config.spec | 4 | ||||
| -rw-r--r-- | fg21sim/extragalactic/clusters/main.py | 10 |
2 files changed, 1 insertions, 13 deletions
diff --git a/fg21sim/configs/config.spec b/fg21sim/configs/config.spec index 74abb69..701bc91 100644 --- a/fg21sim/configs/config.spec +++ b/fg21sim/configs/config.spec @@ -464,7 +464,3 @@ stream = option("stderr", "stdout", "", default="stderr") bolo_freq_min = float(default=10) bolo_freq_max = float(default=1e5) bolo_freq_num = integer(default=256) - - # The threshold for the bolometric emissivity acceleration factor to - # determine whether the halo is genuine/formed. - genuine_threshold = float(default=10) diff --git a/fg21sim/extragalactic/clusters/main.py b/fg21sim/extragalactic/clusters/main.py index e031a8a..4e1f134 100644 --- a/fg21sim/extragalactic/clusters/main.py +++ b/fg21sim/extragalactic/clusters/main.py @@ -93,7 +93,6 @@ class GalaxyClusters: sec = "extragalactic/halos" self.eta_b = configs.getn(sec+"/x_cr") - self.genuine_threshold = configs.getn(sec+"/genuine_threshold") if self.use_dump_halos_data and (not self.use_dump_catalog_data): self.use_dump_catalog_data = True @@ -310,8 +309,6 @@ class GalaxyClusters: configs=self.configs) spectrum = halo.calc_electron_spectrum() spectrum_fiducial = halo.calc_electron_spectrum(fiducial=True) - factor_acc = halo.calc_acc_factor(spectrum, spectrum_fiducial) - genuine = factor_acc >= self.genuine_threshold theta = halo.radius / (clinfo["DA"]*1e3) * AUC.rad2arcsec # [arcsec] haloinfo = OrderedDict( @@ -322,8 +319,6 @@ class GalaxyClusters: spectrum_fiducial=spectrum_fiducial, # [cm^-3] gamma=halo.gamma, # Lorentz factors Ke=halo.injection_rate, # [cm^-3 Gyr^-1] - factor_acc=factor_acc, - genuine=genuine, # bool ) return haloinfo @@ -341,18 +336,15 @@ class GalaxyClusters: num = len(idx_hasmerger) logger.info("Simulating halos for %d clusters with mergers ..." % num) - nhalo = 0 self.halos = [] for i, idx in enumerate(idx_hasmerger): ii = i + 1 if ii % 50 == 0: logger.info("[%d/%d] %.1f%% ..." % (ii, num, 100*ii/num)) haloinfo = self._simulate_halo1(self.catalog[idx]) - nhalo += haloinfo["genuine"] self.halos.append(haloinfo) - logger.info("Simulated radio halos: %d (%.1f%%) genuine." % - (nhalo, 100*nhalo/num)) + logger.info("Simulated radio halos.") def _calc_halos_emission(self): """ |