aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2017-06-23 23:02:30 +0800
committerAaron LI <aly@aaronly.me>2017-06-23 23:02:30 +0800
commitdcec2c7253b66c293c6816223bd8f57295308184 (patch)
treec3ba2e0c6425018d36ae0f3e7e824fe6989a00b0
parentf7082b0266cc32c730aa3685191a1c156963bae8 (diff)
downloadfg21sim-dcec2c7253b66c293c6816223bd8f57295308184.tar.bz2
clusters/halo.py: calculate electron density default end at z0
-rw-r--r--fg21sim/extragalactic/clusters/halo.py22
1 files changed, 12 insertions, 10 deletions
diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py
index d3621f2..3fbd50c 100644
--- a/fg21sim/extragalactic/clusters/halo.py
+++ b/fg21sim/extragalactic/clusters/halo.py
@@ -147,7 +147,7 @@ class HaloSingle:
Default: ``self.zmax``.
zend : float, optional
The redshift where to stop solving the Fokker-Planck equation.
- Default: 0 (i.e., present)
+ Default: ``self.z0``.
Returns
-------
@@ -158,6 +158,15 @@ class HaloSingle:
The solved electron spectrum at ``zend``.
Unit: [cm^-3 mec^-1]
"""
+ if zbegin is None:
+ tstart = self.cosmo.age(self.zmax)
+ else:
+ tstart = self.cosmo.age(zbegin)
+ if zend is None:
+ tstop = self.cosmo.age(self.z0)
+ else:
+ tstop = self.cosmo.age(zend)
+
fpsolver = FokkerPlanckSolver(
xmin=self.pmin, xmax=self.pmax,
grid_num=self.pgrid_num,
@@ -168,16 +177,9 @@ class HaloSingle:
f_injection=self.fp_injection,
)
p = fpsolver.x
- # Assume NO initial electron distribution
+ # Assume NO initial electron distribution, i.e., only
+ # injection.
n0_e = np.zeros(p.shape)
- if zbegin is None:
- tstart = self.cosmo.age(self.zmax)
- else:
- tstart = self.cosmo.age(zbegin)
- if zend is None:
- tstop = self.cosmo.age0
- else:
- tstop = self.cosmo.age(zend)
n_e = fpsolver.solve(u0=n0_e, tstart=tstart, tstop=tstop)
return (p, n_e)