Skip to content

Commit

Permalink
Merge pull request #248 from LSSTDESC/fix_ps_units
Browse files Browse the repository at this point in the history
Fix power spectrum units in power.py
  • Loading branch information
c-d-leonard authored Sep 5, 2017
2 parents 9cfb0e9 + f931f9b commit 33af641
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pyccl/power.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@
from pyutils import _vectorize_fn, _vectorize_fn2

def linear_matter_power(cosmo, k, a):
"""The linear matter power spectrum; Mpc^-3.
"""The linear matter power spectrum; Mpc^3.
Args:
cosmo (:obj:`ccl.cosmology`): Cosmological parameters.
k (float or array_like): Wavenumber; Mpc^-1.
a (float): Scale factor.
Returns:
linear_matter_power (float or array_like): Linear matter power spectrum; Mpc^-3.
linear_matter_power (float or array_like): Linear matter power spectrum; Mpc^3.
"""
return _vectorize_fn2(lib.linear_matter_power,
lib.linear_matter_power_vec, cosmo, k, a)

def nonlin_matter_power(cosmo, k, a):
"""The nonlinear matter power spectrum; Mpc^-3.
"""The nonlinear matter power spectrum; Mpc^3.
Args:
cosmo (:obj:`ccl.cosmology`): Cosmological parameters.
k (float or array_like): Wavenumber; Mpc^-1.
a (float): Scale factor.
Returns:
nonlin_matter_power (float or array_like): Nonlinear matter power spectrum; Mpc^-3.
nonlin_matter_power (float or array_like): Nonlinear matter power spectrum; Mpc^3.
"""
return _vectorize_fn2(lib.nonlin_matter_power,
Expand Down

0 comments on commit 33af641

Please sign in to comment.