aboutsummaryrefslogtreecommitdiffstats
path: root/fg21sim
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2019-01-28 10:32:09 +0800
committerAaron LI <aly@aaronly.me>2019-01-28 10:32:09 +0800
commit8c96ca33ca76d6b593da74817a4b68c52da7b80f (patch)
tree88e8f0914fca3899765e9c05aad6ba3abc159f84 /fg21sim
parentc982158603c0fdad37fb8b0eb596eeba28470b83 (diff)
downloadfg21sim-8c96ca33ca76d6b593da74817a4b68c52da7b80f.tar.bz2
clusters/main: Update spectrum fields and factor_acc calculation
Diffstat (limited to 'fg21sim')
-rw-r--r--fg21sim/extragalactic/clusters/main.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/fg21sim/extragalactic/clusters/main.py b/fg21sim/extragalactic/clusters/main.py
index 25b79c5..7c0e727 100644
--- a/fg21sim/extragalactic/clusters/main.py
+++ b/fg21sim/extragalactic/clusters/main.py
@@ -293,15 +293,17 @@ class GalaxyClusters:
z_merger=clinfo["merger_z"],
merger_num=merger_num,
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)
theta = halo.radius / (clinfo["DA"]*1e3) * AUC.rad2arcsec # [arcsec]
- n_e = halo.calc_electron_spectrum()
- factor_acc = halo.calc_acc_factor(n_e)
haloinfo = OrderedDict(
**clinfo,
Rhalo=halo.radius, # [kpc]
Rhalo_angular=theta, # [arcsec]
- n_e=n_e, # [cm^-3]
+ spectrum=spectrum, # [cm^-3]
+ spectrum_fiducial=spectrum_fiducial, # [cm^-3]
gamma=halo.gamma, # Lorentz factors
Ke=halo.injection_rate, # [cm^-3 Gyr^-1]
factor_acc=factor_acc,