PyCosmo 2.3.0__tar.gz → 2.3.2__tar.gz

{pycosmo-2.3.0/src/PyCosmo.egg-info → pycosmo-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyCosmo
-Version: 2.3.0
+Version: 2.3.2
 Summary: A multi-purpose cosmology calculation tool
 Author-email: Uwe Schmitt et al <uwe.schmitt@id.ethz.ch>
 License-Expression: GPL-3.0

{pycosmo-2.3.0 → pycosmo-2.3.2}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "PyCosmo"
-version = "2.3.0"
+version = "2.3.2"
 license = "GPL-3.0"
 description = "A multi-purpose cosmology calculation tool"
 authors = [{name = "Uwe Schmitt et al", email = "uwe.schmitt@id.ethz.ch"}]

{pycosmo-2.3.0 → pycosmo-2.3.2}/src/PyCosmo/LinearPerturbationApprox.py

@@ -195,26 +195,20 @@ class LinearPerturbationApprox(LinearPerturbationBase):
 
     def _growth_hyper_a(self, a=1.0):  # , Om=0.25,z=0):
         """
-        LCDM growth function D(z) using hypergeometric function. Only
-        valid for LCDM.
-        This comes from Aseem Paranjape and is used for testing.
+        LCDM growth function D(a) via the Carroll-Press-Turner (CPT) hypergeometric
+        ratio form. Only valid for flat LCDM (matter + Lambda).
+        D(a) = a * 2F1(1/3, 1, 11/6; -OL*a^3/Om) / 2F1(1/3, 1, 11/6; -OL/Om),
+        where OL = 1 - Om (flat complement, excludes radiation).
+        D(1) = 1 by construction.
         ; param: a: scale factor
         ; return: D(a): growth factor normalised to 1 at a=1.
         """
-        a = np.atleast_1d(a)
-        a_temp = np.append(a, [1.0])
-        acube = a_temp**3
-        hbyh0 = np.sqrt(self._background._H2_H02_a(a=a_temp))
-        g = (
-            hbyh0
-            / np.sqrt(self._params.omega_m)
-            * np.power(a_temp, 2.5)
-            * special.hyp2f1(
-                5.0 / 6, 1.5, 11.0 / 6, -acube * (1.0 / self._params.omega_m - 1)
-            )
-        )
-        g /= g[-1]  # normalised to 1 at a=1.0
-        return g[:-1]
+        a = np.atleast_1d(a).astype(float)
+        Om = self._params.omega_m
+        OL = 1.0 - Om  # flat complement, NOT omega_l (which includes radiation)
+        x = -OL * a**3 / Om
+        x1 = -OL / Om
+        return a * special.hyp2f1(1.0 / 3, 1.0, 11.0 / 6, x) / special.hyp2f1(1.0 / 3, 1.0, 11.0 / 6, x1)
 
     def transfer_k(self, k):
         r"""

pycosmo-2.3.0/src/PyCosmo/obs.py → pycosmo-2.3.2/src/PyCosmo/Obs.py

@@ -669,13 +669,14 @@ class Obs(object):
                 cls *= obsparams["bias"] ** 2
             elif obsparams["probes"][0] == "gamma":
                 cls = self._cl_lss(ells, cosmo, obsparams)
+                # Apply a multiplicative bias correction of desired
+                cls *= (1.0 + obsparams["m"]) ** 2
                 if obsparams["A_IA"] != 0.0:
+                    # The IA power spectra already include the multiplicative bias
+                    # correction, so they must not be corrected a second time here.
                     cls_IA_II = self.cl_II(ells, cosmo, obsparams)
                     cls_IA_IG = self.cl_IG(ells, cosmo, obsparams)
                     cls += cls_IA_IG + cls_IA_II
-
-                # Apply a multiplicative bias correction of desired
-                cls *= (1.0 + obsparams["m"]) ** 2
             elif obsparams["probes"][0] == "cmbkappa":
                 cls = self._cl_lss(ells, cosmo, obsparams)
                 # Apply a CMB lensing convergence amplitude correction if desired