Skip to content

Commit 62b0bff

Browse files
SUTIENG TamSUTIENG Tam
authored andcommitted
fix flake 8 error
1 parent 5f96edf commit 62b0bff

File tree

2 files changed

+26
-24
lines changed

2 files changed

+26
-24
lines changed

skypy/halos/_colossus.py

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ def colossus_mf(redshift, model, mdef, m_min, m_max, sky_area, cosmology,
204204

205205
return z, m
206206

207+
207208
def concentration(mass, mdef, redshift, model, cosmology, sigma8, ns):
208209
r'''Halo concentration calculator.
209210
@@ -228,7 +229,7 @@ def concentration(mass, mdef, redshift, model, cosmology, sigma8, ns):
228229
scale of 8 Mpc/h.
229230
ns : float
230231
Cosmology parameter, spectral index of scalar perturbation power spectrum.
231-
232+
232233
Returns
233234
-------
234235
concentration : float or array_like
@@ -237,13 +238,14 @@ def concentration(mass, mdef, redshift, model, cosmology, sigma8, ns):
237238
'''
238239
from colossus.cosmology.cosmology import fromAstropy
239240
from colossus.halo import concentration
240-
241+
241242
fromAstropy(cosmology, sigma8=sigma8, ns=ns)
242-
243+
243244
c = concentration.concentration(mass, mdef, redshift, model)
244-
245+
245246
return c
246247

248+
247249
def radius(mass, concentration, redshift, mdef, Delta, cosmology, sigma8, ns):
248250
r'''Calculate the scale radius and the spherical overdensity radius of halo by assuming
249251
the NFW model.
@@ -271,7 +273,7 @@ def radius(mass, concentration, redshift, mdef, Delta, cosmology, sigma8, ns):
271273
scale of 8 Mpc/h.
272274
ns : float
273275
Cosmology parameter, spectral index of scalar perturbation power spectrum.
274-
276+
275277
Returns
276278
-------
277279
rs : float
@@ -282,16 +284,16 @@ def radius(mass, concentration, redshift, mdef, Delta, cosmology, sigma8, ns):
282284
'''
283285
from colossus.cosmology.cosmology import fromAstropy
284286
from colossus.halo import profile_nfw
285-
287+
286288
fromAstropy(cosmology, sigma8=sigma8, ns=ns)
287289

288-
prof = profile_nfw.NFWProfile(M = mass, c = concentration, z = redshift, mdef = mdef)
290+
prof = profile_nfw.NFWProfile(M=mass, c=concentration, z=redshift, mdef=mdef)
289291
rs = prof.par['rs']
290-
RDelta = prof.RDelta(redshift, Delta)
292+
RDelta = prof.RDelta(redshift, Delta)
291293

292294
return rs, RDelta
293-
294-
295+
296+
295297
def Delta_Sigma(mass, concentration, redshift, mdef, radius, cosmology, sigma8, ns):
296298
r'''The excess surface density at given radius by assuming the NFW model.
297299
@@ -318,20 +320,20 @@ def Delta_Sigma(mass, concentration, redshift, mdef, radius, cosmology, sigma8,
318320
scale of 8 Mpc/h.
319321
ns : float
320322
Cosmology parameter, spectral index of scalar perturbation power spectrum.
321-
323+
322324
Returns
323325
-------
324326
DeltaSigma: float or array_like
325327
The excess surface density at the given radius, in units of h physical Msun/kpc^2;
326328
has the same dimensions as radius.
327-
329+
328330
'''
329331
from colossus.cosmology.cosmology import fromAstropy
330332
from colossus.halo import profile_nfw
331-
333+
332334
fromAstropy(cosmology, sigma8=sigma8, ns=ns)
333335

334-
prof = profile_nfw.NFWProfile(M = mass, c = concentration, z = redshift, mdef = mdef)
336+
prof = profile_nfw.NFWProfile(M=mass, c=concentration, z=redshift, mdef=mdef)
335337
deltaSigma = prof.deltaSigma(radius)
336338

337339
return deltaSigma

skypy/halos/tests/test_colossus.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,28 +106,28 @@ def test_colossus_mf():
106106
assert np.all(m_halo >= m_min)
107107
assert np.all(m_halo <= m_max)
108108

109+
109110
@pytest.mark.skipif(not HAS_COLOSSUS, reason='test requires colossus')
110111
@pytest.mark.flaky
111112
def test_colossus_concentration():
112113
from skypy.halos._colossus import concentration
113114
from astropy.cosmology import Planck15
114-
from colossus.cosmology.cosmology import fromAstropy
115-
116-
mass=np.logspace(np.log10(1e+14), np.log10(1e+15), 10)
115+
116+
mass = np.logspace(np.log10(1e+14), np.log10(1e+15), 10)
117117
model, mdef = 'diemer19', '200c'
118118
redshift = 0.5
119119
cosmo = Planck15
120120
sigma8, ns = 0.82, 0.96
121121
c = concentration(mass, mdef, redshift, model, cosmo, sigma8, ns)
122-
122+
123123
assert len(c) == len(mass)
124-
124+
125+
125126
@pytest.mark.skipif(not HAS_COLOSSUS, reason='test requires colossus')
126127
@pytest.mark.flaky
127128
def test_colossus_radius():
128129
from skypy.halos._colossus import radius
129130
from astropy.cosmology import Planck15
130-
from colossus.cosmology.cosmology import fromAstropy
131131

132132
mass, c, redshift = 1e+15, 3, 0.5
133133
Delta, mdef = '500c', '200c'
@@ -138,20 +138,20 @@ def test_colossus_radius():
138138

139139
assert rs > 0
140140
assert RDelta > 0
141-
141+
142+
142143
@pytest.mark.skipif(not HAS_COLOSSUS, reason='test requires colossus')
143144
@pytest.mark.flaky
144145
def test_colossus_Delta_Sigma():
145146
from skypy.halos._colossus import Delta_Sigma
146147
from astropy.cosmology import Planck15
147-
from colossus.cosmology.cosmology import fromAstropy
148148

149149
mass, c, redshift = 1e+15, 3, 0.5
150150
mdef = '200c'
151151
cosmo = Planck15
152152
sigma8, ns = 0.82, 0.96
153153
radius = np.logspace(np.log10(300), np.log10(3000), 10)
154-
155-
DeltaSigma=Delta_Sigma(mass, c, redshift, mdef, radius, cosmo, sigma8, ns)
154+
155+
DeltaSigma = Delta_Sigma(mass, c, redshift, mdef, radius, cosmo, sigma8, ns)
156156

157157
assert len(DeltaSigma) == len(radius)

0 commit comments

Comments
 (0)