PyCosmo 2.1.3__tar.gz → 2.2.0__tar.gz

{PyCosmo-2.1.3 → pycosmo-2.2.0}/AUTHORS.rst

@@ -19,4 +19,3 @@ Contact information
 
 If you have any suggestions or questions about PyCosmo feel free to email us
 at pycosmo@lists.phys.ethz.ch.
-

{PyCosmo-2.1.3/src/PyCosmo.egg-info → pycosmo-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyCosmo
-Version: 2.1.3
+Version: 2.2.0
 Summary: A multi-purpose cosmology calculation tool
 Author: Uwe Schmitt et al
 Author-email: uwe.schmitt@id.ethz.ch
@@ -22,7 +22,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: numpy
+Requires-Dist: numpy<2
 Requires-Dist: recfast4py>=0.2.3
 Requires-Dist: dill
 Requires-Dist: matplotlib
@@ -33,17 +33,12 @@ Requires-Dist: scipy
 Provides-Extra: dev
 Requires-Dist: Cython; extra == "dev"
 Requires-Dist: twine; extra == "dev"
-Requires-Dist: pytest<7.2.0; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest-regtest; extra == "dev"
-Requires-Dist: tox; extra == "dev"
-Requires-Dist: flake8; extra == "dev"
-Requires-Dist: black; extra == "dev"
+Requires-Dist: pytest-regtest>=2.2.0a2; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
 Requires-Dist: isort; extra == "dev"
-Requires-Dist: sphinx<7; extra == "dev"
-Requires-Dist: sphinx-pynpoint-theme; extra == "dev"
-Requires-Dist: myst-parser; extra == "dev"
-Requires-Dist: memray; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: sphinx<7; extra == "docs"
 Requires-Dist: sphinx-pynpoint-theme; extra == "docs"

{PyCosmo-2.1.3 → pycosmo-2.2.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = PyCosmo
-version = 2.1.3
+version = 2.2.0
 license = GPLv3
 description = A multi-purpose cosmology calculation tool
 long_description = file: README.rst
@@ -25,7 +25,7 @@ project_urls =
 
 [options]
 install_requires = 
-	numpy
+	numpy<2
 	recfast4py>=0.2.3
 	dill
 	matplotlib
@@ -57,17 +57,12 @@ console_scripts =
 dev = 
 	Cython
 	twine
-	pytest<7.2.0
+	pytest
 	pytest-cov
-	pytest-regtest
-	tox
-	flake8
-	black
+	pytest-regtest>=2.2.0a2
+	ruff
 	isort
-	sphinx < 7
-	sphinx-pynpoint-theme
-	myst-parser
-	memray
+	pre-commit
 docs = 
 	sphinx < 7
 	sphinx-pynpoint-theme

pycosmo-2.2.0/setup.py

@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+import numpy
+from Cython.Build import cythonize
+from setuptools import Extension, setup
+
+files = [
+    "const.c",
+    "main.c",
+    "polevl.c",
+    "sici.c",
+    "sicif.c",
+    "polevlf.c",
+    "logf.c",
+    "sinf.c",
+    "constf.c",
+    "mtherr.c",
+]
+ext_modules = []
+
+
+for stem in (
+    "halo_integral",
+    "halo_integral_1h",
+    "halo_integral_2h",
+    "halo_integral_HI_1h",
+    "halo_integral_HI_2h",
+    "rho_HI_integral",
+    "rho_m_integral",
+):
+    ext_modules.append(
+        Extension(
+            name=f"PyCosmo.cython.{stem}",
+            ext_modules=cythonize(f"src/PyCosmo/cython/{stem}.pyx"),
+            sources=["src/PyCosmo/cython/" + file for file in files + [stem + ".c"]],
+            include_dirs=[numpy.get_include()],
+        )
+    )
+
+setup(
+    ext_modules=ext_modules,
+)

{PyCosmo-2.1.3 → pycosmo-2.2.0}/src/PyCosmo/Background.py

@@ -91,8 +91,7 @@ class Background(object):
     def _H2_H02_Omegam_a(self, a=1.0):
         self._cosmo.reset_wrapper_globals()
         return (
-            self._params.omega_m / a**3
-            + _call(self._wrapper, "omega_nu_m", a) / a**4
+            self._params.omega_m / a**3 + _call(self._wrapper, "omega_nu_m", a) / a**4
         )
 
     def _H2_H02_Omegak_a(self, a=1.0):

{PyCosmo-2.1.3 → pycosmo-2.2.0}/src/PyCosmo/BoltzmannSolver/Fields.py

@@ -65,7 +65,6 @@ class Fields(object):
         return super().__dir__() + list(map(str, self._symbols))
 
     def __getattr__(self, symbol):
-
         # needed to support pickling:
         if "_offsets" not in vars(self):
             raise AttributeError()

{PyCosmo-2.1.3 → pycosmo-2.2.0}/src/PyCosmo/BoltzmannSolver/LinearPerturbationBoltzmann.py

@@ -26,6 +26,7 @@ from ..LinearPerturbationBase import LinearPerturbationBase
 from .Fields import Fields
 from .LsodaSolver import LsodaSolver
 
+
 # use decorator to print messages only once per model:
 @lru_cache(maxsize=1)  # noqa: E302
 def print_new_traces(cache_file):
@@ -196,9 +197,7 @@ class LinearPerturbationBoltzmann(LinearPerturbationBase):
                 pk = norm * growth**2 * k**self._params.n * T_k**2
             else:
                 # pk = norm * np.outer(growth.T ** 2, k ** self._params.n * T_k ** 2).T
-                pk = (
-                    norm * growth**2 * (k**self._params.n * T_k**2).reshape(-1, 1)
-                )
+                pk = norm * growth**2 * (k**self._params.n * T_k**2).reshape(-1, 1)
 
         if (self._params.pk_norm_type == "A_s") or (
             self._params.pk_norm_type == "sigma8"

{PyCosmo-2.1.3 → pycosmo-2.2.0}/src/PyCosmo/BoltzmannSolver/LsodaSolver.py

@@ -21,7 +21,6 @@ import numpy as np
 
 
 class LsodaSolver:
-
     SOLVER_ID = "linear_perturbation"
 
     _wrappers = {}
@@ -89,7 +88,6 @@ class LsodaSolver:
         enable_sparse_lu_solver=True,
         keep_lna0=False,
     ):
-
         self._setup_globals(k)
         self.wrapper.set_sec_factor(sec_factor)
 

{PyCosmo-2.1.3 → pycosmo-2.2.0}/src/PyCosmo/BoltzmannSolver/ScipySolver.py

@@ -24,7 +24,6 @@ from .Fields import Fields
 
 
 class ScipySolver:
-
     _wrappers = {}
 
     def __init__(

{PyCosmo-2.1.3 → pycosmo-2.2.0}/src/PyCosmo/Cosmo.py

@@ -325,7 +325,9 @@ class Cosmo(object):
         merged.update(derived_parameters_pre)
         merged.update(self.model_specific_parameters)
 
-        if self._last_merged is not None and self._last_merged == merged:
+        if self._last_merged is not None and (
+            dill.dumps(self._last_merged) == dill.dumps(merged)
+        ):
             return
 
         self._last_merged = merged
@@ -438,6 +440,22 @@ class Cosmo(object):
 
             self.nonlin_pert = NonLinearPerturbationMead(self)
 
+        elif params.pk_nonlin_type == "HaloModel":
+            assert (
+                params.pk_type != "boltz"
+            ), "HaloModel not supported by the Boltzmann solver yet!"
+            from .NonLinearPerturbation_HaloModel import NonLinearPerturbation_HaloModel
+
+            self.nonlin_pert = NonLinearPerturbation_HaloModel(self)
+
+        elif params.pk_nonlin_type == "HI":
+            assert (
+                params.pk_type != "boltz"
+            ), "HI not supported by the Boltzmann solver yet!"
+            from .NonLinearPerturbation_HI import NonLinearPerturbation_HI
+
+            self.nonlin_pert = NonLinearPerturbation_HI(self)
+
         elif params.pk_nonlin_type is None:
             self.nonlin_pert = None
 
@@ -540,10 +558,7 @@ class Cosmo(object):
         )
 
         derived_parameters.omega_gamma_prefactor = (
-            np.pi**2
-            / 15
-            * (2.725 * params.kb) ** 4
-            / (derived_parameters.rho_gamma_eV)
+            np.pi**2 / 15 * (2.725 * params.kb) ** 4 / (derived_parameters.rho_gamma_eV)
         )
         derived_parameters.omega_gamma = (
             derived_parameters.omega_gamma_prefactor
@@ -651,9 +666,7 @@ class Cosmo(object):
         # TODO: this differs from z_eq in the cosmo class. should probably rename
         # it to avoid confusion
         # Redshift at matter-radiation equality, Eq. (2)
-        derived_parameters._z_equality = (
-            2.5e4 * omh2 * derived_parameters._sigma_27**-4
-        )
+        derived_parameters._z_equality = 2.5e4 * omh2 * derived_parameters._sigma_27**-4
         b_1 = 0.313 * omh2**-0.419 * (1.0 + 0.607 * omh2**0.674)
         b_2 = 0.238 * omh2**0.223
         derived_parameters._z_drag = (

{PyCosmo-2.1.3 → pycosmo-2.2.0}/src/PyCosmo/CosmologyCore.py

@@ -141,9 +141,7 @@ omega_l_a = IfThenElse(flat_universe, (1 - omega_m - omega_r), omega_l)
 omega_k = 1 - omega_m - omega_r - omega_l_a
 
 # Friedmann equation
-H = H0 * (omega_r * a**-4 + omega_m * a**-3 + omega_k * a**-2 + omega_l_a) ** (
-    1 / 2
-)
+H = H0 * (omega_r * a**-4 + omega_m * a**-3 + omega_k * a**-2 + omega_l_a) ** (1 / 2)
 
 R = (3 / 4) * omega_b / omega_gamma * a
 
@@ -522,14 +520,10 @@ def rhs(H=H_Mpc, H0=H0_Mpc, R=R, l_max=l_max):
     dTheta_dlan[0] = -k_H * Theta[1] - dPhi_dlan  # 0th photon multipole
     dTheta_dlan[1] = k_H / 3 * (Theta[0] - 2 * Theta[2] + Psi) + taudot_interp(a) / (
         a * H
-    ) * (
-        Theta[1] - u_b / 3
-    )  # 1st photon multipole
+    ) * (Theta[1] - u_b / 3)  # 1st photon multipole
     dTheta_dlan[2] = k_H / 5 * (2 * Theta[1] - 3 * Theta[3]) + taudot_interp(a) / (
         a * H
-    ) * (
-        Theta[2] - Pi / 10
-    )  # 2nd photon multipole
+    ) * (Theta[2] - Pi / 10)  # 2nd photon multipole
 
     dTheta_P_dlan[0] = k_H / 1 * -Theta_P[1] + taudot_interp(a) / (a * H) * (
         Theta_P[0] - Pi / 2
@@ -540,9 +534,7 @@ def rhs(H=H_Mpc, H0=H0_Mpc, R=R, l_max=l_max):
     )  # 1st photon polarization multipole
     dTheta_P_dlan[2] = k_H / 5 * (2 * Theta_P[1] - 3 * Theta_P[3]) + taudot_interp(
         a
-    ) / (a * H) * (
-        Theta_P[2] - Pi / 10
-    )  # 2nd photon polarization multipole
+    ) / (a * H) * (Theta_P[2] - Pi / 10)  # 2nd photon polarization multipole
 
     for l in range(3, l_max):  # lth photons multipoles
         dTheta_dlan[l] = (

{PyCosmo-2.1.3 → pycosmo-2.2.0}/src/PyCosmo/CosmologyCore_massivenu.py

@@ -121,6 +121,7 @@ globals_ = Globals(
     T_mnu,
 )
 
+
 # check functions used to impose conditions
 # on the parameters
 def check_massive_nu_total_mass(params):
@@ -767,14 +768,10 @@ def rhs(H=H_Mpc, H0=H0_Mpc, amnu=amnu):
     dTheta_dlan[0] = -k_H * Theta[1] - dPhi_dlan  # 0th photon multipole
     dTheta_dlan[1] = k_H / 3 * (Theta[0] - 2 * Theta[2] + Psi) + taudot_interp(a) / (
         a * H
-    ) * (
-        Theta[1] - u_b / 3
-    )  # 1st photon multipole
+    ) * (Theta[1] - u_b / 3)  # 1st photon multipole
     dTheta_dlan[2] = k_H / 5 * (2 * Theta[1] - 3 * Theta[3]) + taudot_interp(a) / (
         a * H
-    ) * (
-        Theta[2] - Pi / 10
-    )  # 2nd photon multipole
+    ) * (Theta[2] - Pi / 10)  # 2nd photon multipole
 
     dTheta_P_dlan[0] = k_H / 1 * -Theta_P[1] + taudot_interp(a) / (a * H) * (
         Theta_P[0] - Pi / 2
@@ -785,9 +782,7 @@ def rhs(H=H_Mpc, H0=H0_Mpc, amnu=amnu):
     )  # 1st photon polarization multipole
     dTheta_P_dlan[2] = k_H / 5 * (2 * Theta_P[1] - 3 * Theta_P[3]) + taudot_interp(
         a
-    ) / (a * H) * (
-        Theta_P[2] - Pi / 10
-    )  # 2nd photon polarization multipole
+    ) / (a * H) * (Theta_P[2] - Pi / 10)  # 2nd photon polarization multipole
 
     for l in range(3, l_max):  # lth photons multipoles
         dTheta_dlan[l] = (
@@ -845,7 +840,6 @@ def rhs(H=H_Mpc, H0=H0_Mpc, amnu=amnu):
 
     for m in range(2, l_max_mnu):
         for j in range(nq):
-
             dM_dlan[m * nq + j] = (
                 qq[j]
                 * k
@@ -862,10 +856,7 @@ def rhs(H=H_Mpc, H0=H0_Mpc, amnu=amnu):
             1
             / (a * H)
             * (
-                qq[j]
-                * k
-                / sp.sqrt(amnu**2 + qq[j] ** 2)
-                * M[(l_max_mnu - 1) * nq + j]
+                qq[j] * k / sp.sqrt(amnu**2 + qq[j] ** 2) * M[(l_max_mnu - 1) * nq + j]
                 - (l_max_mnu + 1) / eta_interp(a) * M[l_max_mnu * nq + j]
             )
         )

{PyCosmo-2.1.3 → pycosmo-2.2.0}/src/PyCosmo/CosmologyCore_massivenu_rsa.py

@@ -140,7 +140,6 @@ def rhs_rsa(H=H_Mpc, H0=H0_Mpc, R=R, amnu=amnu, l_max=2):
     # lth multipoles massive neutrinos
     for m in range(2, l_max_mnu):
         for j in range(nq):
-
             dM_dlan[m * nq + j] = (
                 qq[j]
                 * k
@@ -153,10 +152,7 @@ def rhs_rsa(H=H_Mpc, H0=H0_Mpc, R=R, amnu=amnu, l_max=2):
             1
             / (a * H)
             * (
-                qq[j]
-                * k
-                / sp.sqrt(amnu**2 + qq[j] ** 2)
-                * M[(l_max_mnu - 1) * nq + j]
+                qq[j] * k / sp.sqrt(amnu**2 + qq[j] ** 2) * M[(l_max_mnu - 1) * nq + j]
                 - (l_max_mnu + 1) / eta_interp(a) * M[l_max_mnu * nq + j]
             )
         )
@@ -232,13 +228,7 @@ def merge(wrapper, t_0, t_switch, t_1, y_0, y_1):  # pragma: no cover
     T_0 = Tcmb * T_mnu
     amnu = a * massive_nu_total_mass / (N_massive_nu * kb * T_0)
     rho_ev = (
-        3
-        * H0**2
-        * (hbar) ** 3
-        * c_ms**3
-        / (8 * np.pi * G)
-        / evc2
-        / (mpc / 1000) ** 2
+        3 * H0**2 * (hbar) ** 3 * c_ms**3 / (8 * np.pi * G) / evc2 / (mpc / 1000) ** 2
     ) / (kb * T_0) ** 4
     C_nu = N_massive_nu / (2 * np.pi) ** 2 / rho_ev
 

{PyCosmo-2.1.3 → pycosmo-2.2.0}/src/PyCosmo/CosmologyCore_massivenu_wcdm.py

@@ -129,6 +129,7 @@ globals_ = Globals(
     cs_de2,
 )
 
+
 # check functions used to impose conditions
 # on the parameters
 def check_massive_nu_total_mass(params):
@@ -816,14 +817,10 @@ def rhs(H=H_Mpc, H0=H0_Mpc, R=R, amnu=amnu):
     dTheta_dlan[0] = -k_H * Theta[1] - dPhi_dlan  # 0th photon multipole
     dTheta_dlan[1] = k_H / 3 * (Theta[0] - 2 * Theta[2] + Psi) + taudot_interp(a) / (
         a * H
-    ) * (
-        Theta[1] - u_b / 3
-    )  # 1st photon multipole
+    ) * (Theta[1] - u_b / 3)  # 1st photon multipole
     dTheta_dlan[2] = k_H / 5 * (2 * Theta[1] - 3 * Theta[3]) + taudot_interp(a) / (
         a * H
-    ) * (
-        Theta[2] - Pi / 10
-    )  # 2nd photon multipole
+    ) * (Theta[2] - Pi / 10)  # 2nd photon multipole
 
     dTheta_P_dlan[0] = k_H / 1 * -Theta_P[1] + taudot_interp(a) / (a * H) * (
         Theta_P[0] - Pi / 2
@@ -834,9 +831,7 @@ def rhs(H=H_Mpc, H0=H0_Mpc, R=R, amnu=amnu):
     )  # 1st photon polarization multipole
     dTheta_P_dlan[2] = k_H / 5 * (2 * Theta_P[1] - 3 * Theta_P[3]) + taudot_interp(
         a
-    ) / (a * H) * (
-        Theta_P[2] - Pi / 10
-    )  # 2nd photon polarization multipole
+    ) / (a * H) * (Theta_P[2] - Pi / 10)  # 2nd photon polarization multipole
 
     for l in range(3, l_max):  # lth photons multipoles
         dTheta_dlan[l] = (
@@ -894,7 +889,6 @@ def rhs(H=H_Mpc, H0=H0_Mpc, R=R, amnu=amnu):
 
     for m in range(2, l_max_mnu):
         for j in range(nq):
-
             dM_dlan[m * nq + j] = (
                 qq[j]
                 * k
@@ -911,10 +905,7 @@ def rhs(H=H_Mpc, H0=H0_Mpc, R=R, amnu=amnu):
             1
             / (a * H)
             * (
-                qq[j]
-                * k
-                / sp.sqrt(amnu**2 + qq[j] ** 2)
-                * M[(l_max_mnu - 1) * nq + j]
+                qq[j] * k / sp.sqrt(amnu**2 + qq[j] ** 2) * M[(l_max_mnu - 1) * nq + j]
                 - (l_max_mnu + 1) / eta_interp(a) * M[l_max_mnu * nq + j]
             )
         )

{PyCosmo-2.1.3 → pycosmo-2.2.0}/src/PyCosmo/CosmologyCore_massivenu_wcdm_rsa.py

@@ -157,7 +157,6 @@ def rhs_rsa(H=H_Mpc, H0=H0_Mpc, R=R, amnu=amnu, l_max=2):
     # lth multipoles massive neutrinos
     for m in range(2, l_max_mnu):
         for j in range(nq):
-
             dM_dlan[m * nq + j] = (
                 qq[j]
                 * k
@@ -170,10 +169,7 @@ def rhs_rsa(H=H_Mpc, H0=H0_Mpc, R=R, amnu=amnu, l_max=2):
             1
             / (a * H)
             * (
-                qq[j]
-                * k
-                / sp.sqrt(amnu**2 + qq[j] ** 2)
-                * M[(l_max_mnu - 1) * nq + j]
+                qq[j] * k / sp.sqrt(amnu**2 + qq[j] ** 2) * M[(l_max_mnu - 1) * nq + j]
                 - (l_max_mnu + 1) / eta_interp(a) * M[l_max_mnu * nq + j]
             )
         )
@@ -256,13 +252,7 @@ def merge(wrapper, t_0, t_switch, t_1, y_0, y_1):  # pragma: no cover
     T_0 = Tcmb * T_mnu
     amnu = a * massive_nu_total_mass / (N_massive_nu * kb * T_0)
     rho_ev = (
-        3
-        * H0**2
-        * (hbar) ** 3
-        * c_ms**3
-        / (8 * np.pi * G)
-        / evc2
-        / (mpc / 1000) ** 2
+        3 * H0**2 * (hbar) ** 3 * c_ms**3 / (8 * np.pi * G) / evc2 / (mpc / 1000) ** 2
     ) / (kb * T_0) ** 4
     C_nu = N_massive_nu / (2 * np.pi) ** 2 / rho_ev
 

{PyCosmo-2.1.3 → pycosmo-2.2.0}/src/PyCosmo/CosmologyCore_wcdm.py

@@ -106,6 +106,7 @@ neq = 5 + 2 + 3 * (l_max + 1)
 # w_a is w(a), not to be confused with wa
 w_a = w0
 
+
 # check functions used to impose conditions
 # on the parameters
 def check_wa(params):
@@ -165,9 +166,7 @@ omega_l_a = IfThenElse(
 omega_k = 1 - omega_m - omega_r - omega_l_a.subs({a: 1})
 
 # Friedmann equation
-H = H0 * (omega_r * a**-4 + omega_m * a**-3 + omega_k * a**-2 + omega_l_a) ** (
-    1 / 2
-)
+H = H0 * (omega_r * a**-4 + omega_m * a**-3 + omega_k * a**-2 + omega_l_a) ** (1 / 2)
 
 R = 3 / 4 * omega_b / omega_gamma * a
 
@@ -570,14 +569,10 @@ def rhs(H=H_Mpc, H0=H0_Mpc, R=R):
     dTheta_dlan[0] = -k_H * Theta[1] - dPhi_dlan  # 0th photon multipole
     dTheta_dlan[1] = k_H / 3 * (Theta[0] - 2 * Theta[2] + Psi) + taudot_interp(a) / (
         a * H
-    ) * (
-        Theta[1] - u_b / 3
-    )  # 1st photon multipole
+    ) * (Theta[1] - u_b / 3)  # 1st photon multipole
     dTheta_dlan[2] = k_H / 5 * (2 * Theta[1] - 3 * Theta[3]) + taudot_interp(a) / (
         a * H
-    ) * (
-        Theta[2] - Pi / 10
-    )  # 2nd photon multipole
+    ) * (Theta[2] - Pi / 10)  # 2nd photon multipole
 
     dTheta_P_dlan[0] = k_H / 1 * -Theta_P[1] + taudot_interp(a) / (a * H) * (
         Theta_P[0] - Pi / 2
@@ -588,9 +583,7 @@ def rhs(H=H_Mpc, H0=H0_Mpc, R=R):
     )  # 1st photon polarization multipole
     dTheta_P_dlan[2] = k_H / 5 * (2 * Theta_P[1] - 3 * Theta_P[3]) + taudot_interp(
         a
-    ) / (a * H) * (
-        Theta_P[2] - Pi / 10
-    )  # 2nd photon polarization multipole
+    ) / (a * H) * (Theta_P[2] - Pi / 10)  # 2nd photon polarization multipole
 
     for l in range(3, l_max):  # lth photons multipoles
         dTheta_dlan[l] = (

{PyCosmo-2.1.3 → pycosmo-2.2.0}/src/PyCosmo/LinearPerturbationApprox.py

@@ -21,7 +21,6 @@ from .LinearPerturbationBase import LinearPerturbationBase
 
 
 class LinearPerturbationApprox(LinearPerturbationBase):
-
     r"""
     Class created to manage fitting functions for the computation of the linear matter
     power spectrum :math:`P_{lin}(k)`.  The fitting functions provide transfer
@@ -170,10 +169,9 @@ class LinearPerturbationApprox(LinearPerturbationBase):
 
         _dlnh_dlna = self._background._dlnh_dlna(a=a_temp)[0]
 
-        f2 = (
-            -(4.0 + _dlnh_dlna) * y[1]
-            - (3.0 + _dlnh_dlna - 1.5 * self._background._omega_m_a(a=a_temp)) * y[0]
-        )
+        f2 = -(4.0 + _dlnh_dlna) * y[1] - (
+            3.0 + _dlnh_dlna - 1.5 * self._background._omega_m_a(a=a_temp)
+        ) * y[0]
         return [f1, f2]
 
     def _growth_derivs_nu(self, y, x):
@@ -188,10 +186,9 @@ class LinearPerturbationApprox(LinearPerturbationBase):
 
         _dlnh_dlna = self._background._dlnh_dlna_massive_nu(a=a_temp)
 
-        f2 = (
-            -(4.0 + _dlnh_dlna) * y[1]
-            - (3.0 + _dlnh_dlna - 1.5 * self._background._omega_m_a(a=a_temp)) * y[0]
-        )
+        f2 = -(4.0 + _dlnh_dlna) * y[1] - (
+            3.0 + _dlnh_dlna - 1.5 * self._background._omega_m_a(a=a_temp)
+        ) * y[0]
         return [f1, f2]
 
     def _growth_hyper_a(self, a=1.0):  # , Om=0.25,z=0):
@@ -574,7 +571,6 @@ class LinearPerturbationApprox(LinearPerturbationBase):
         """
 
         if self._params.pk_type == "EH":
-
             self._set_eh_params()
 
         if self._params.pk_type in ("BBKS", "BBKS_CCL"):
@@ -611,14 +607,11 @@ class LinearPerturbationApprox(LinearPerturbationBase):
         return None
 
     def _set_eh_params(self):
-
         if (
             self._params.N_massive_nu == 0.0
             or self._params.massive_nu_total_mass == 0.0
         ):
-            omh2 = (
-                self._params.omega_m + self._params.omega_nu_m
-            ) * self._params.h**2
+            omh2 = (self._params.omega_m + self._params.omega_nu_m) * self._params.h**2
 
             self._params._k_Silk = (
                 1.6
@@ -666,7 +659,6 @@ class LinearPerturbationApprox(LinearPerturbationBase):
             self._params._beta_node = 8.41 * omh2**0.435
 
         else:
-
             omh2_nu = (
                 self._params.omega_m + self._params.omega_nu_m
             ) * self._params.h**2
@@ -683,10 +675,7 @@ class LinearPerturbationApprox(LinearPerturbationBase):
                 1291.0
                 * (omh2_nu**0.251)
                 / (1.0 + 0.659 * omh2_nu**0.828)
-                * (
-                    1.0
-                    + b_1_nu * (self._params.omega_b * self._params.h**2) ** b_2_nu
-                )
+                * (1.0 + b_1_nu * (self._params.omega_b * self._params.h**2) ** b_2_nu)
             )  # Redshift at drag epoch, Eq. (4)
 
             # Wave vector values, modified to include Omega_nu_m in Omega_m

{PyCosmo-2.1.3 → pycosmo-2.2.0}/src/PyCosmo/LinearPerturbationTable.py

@@ -22,7 +22,6 @@ from PyCosmo.LinearPerturbationBase import LinearPerturbationBase
 
 
 class LinearPerturbationTable(LinearPerturbationBase):
-
     """
     This class represents the interface to the tables class, which builds
     tabulated data for the costly calculations. Using this tabulated data

{PyCosmo-2.1.3 → pycosmo-2.2.0}/src/PyCosmo/NonLinearPerturbationHaloFit.py

@@ -22,7 +22,6 @@ from PyCosmo.PerturbationBase import NonLinearPerturbationBase
 
 
 class NonLinearPerturbationHaloFit(NonLinearPerturbationBase):
-
     """
     The class computes the non-linear matter power spectrum, :math:`P_{nl}(k)`,
     with a choice of analytic fitting funtions.
@@ -255,7 +254,7 @@ class NonLinearPerturbationHaloFit(NonLinearPerturbationBase):
         kseek = np.logspace(logkmin, logkmax, nk)
 
         sig2gauss = np.trapz(
-            np.exp(-np.outer(1 / kseek, k) ** 2) * Dlin / k, x=k, axis=1
+            np.exp(-(np.outer(1 / kseek, k) ** 2)) * Dlin / k, x=k, axis=1
         )
 
         ksig = np.interp(1.0, sig2gauss, kseek)