From 8c96ca33ca76d6b593da74817a4b68c52da7b80f Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Mon, 28 Jan 2019 10:32:09 +0800 Subject: clusters/main: Update spectrum fields and factor_acc calculation --- fg21sim/extragalactic/clusters/main.py | 8 +++++--- 1 file 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, -- cgit v1.2.2