classy-szfast 0.0.25.post8__tar.gz → 0.0.25.post10__tar.gz

{classy_szfast-0.0.25.post8 → classy_szfast-0.0.25.post10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: classy_szfast
-Version: 0.0.25.post8
+Version: 0.0.25.post10
 Summary: The accelerator of the class_sz code from https://github.com/CLASS-SZ
 Maintainer-email: Boris Bolliet <bb667@cam.ac.uk>
 License: MIT
@@ -11,6 +11,6 @@ Requires-Dist: numpy>=1.19.0
 Requires-Dist: Cython>=0.29.21
 Requires-Dist: tensorflow
 Requires-Dist: mcfit
-Requires-Dist: get_cosmopower_emus
+Requires-Dist: get_cosmopower_emus==0.0.15
 Requires-Dist: class_sz_data
 Requires-Dist: cosmopower-jax

{classy_szfast-0.0.25.post8 → classy_szfast-0.0.25.post10}/classy_szfast/classy_szfast.py

@@ -294,6 +294,16 @@ class Class_szfast(object):
         H = self.hz_interp(z)
         rho_crit = (3./(8.*self.pi*Const._G_*Const._M_sun_))*pow(Const._Mpc_over_m_,1)*self.pow(Const._c_,2)*self.pow(H,2)/self.pow(params_values['h'],2)
         return rho_crit
+    
+    def get_volume_dVdzdOmega_at_z(self,z,params_values_dict=None):
+        params_values = self.get_all_relevant_params(params_values_dict)
+        self.calculate_hubble(**params_values_dict)
+        Ez = self.hz_interp(z)/self.hz_interp(0.)
+        self.calculate_chi(**params_values_dict)
+        dA = self.chi_interp(z)/(1.+z)
+        rz = dA*(1.+z)*params_values['h']
+        dVdzdOmega = 2.99792458e8/1.0e5*rz*rz/Ez
+        return dVdzdOmega
 
     def get_r_delta_of_m_delta_at_z(self,delta,m_delta,z,params_values_dict=None):
         if params_values_dict:
@@ -602,6 +612,39 @@ class Class_szfast(object):
         self.cszfast_pk_grid_dsigma2_flat = dvar.flatten()
  
         return 0
+    
+    def calculate_vrms2(self,**params_values_dict):
+        # k = self.cszfast_pk_grid_k
+        k = np.geomspace(1e-5,1e1,1000)
+        
+        
+        # z = self.cszfast_pk_grid_z
+        z = np.linspace(0,3,800)
+
+        # P = self.cszfast_pk_grid_pk
+        P = np.asarray([self.get_pkl_at_k_and_z(k,zpx) for zpx in z])
+
+        a = 1/(1+z)
+        H = self.get_hubble(z)
+        z0 = 0.
+
+        k0 = 1e-2
+        pks = self.get_pkl_at_k_and_z(k0,z)
+        pks0 = self.get_pkl_at_k_and_z(k0,z0)
+        D = np.sqrt(pks/pks0)
+
+        f = -np.gradient(np.log(D), np.log(1 + z))
+
+        W = f*a*H
+        x = np.log(k)
+        I = 1/3*W[:,None]**2*P*k/2/np.pi**2
+
+
+        vrms2 = scipy.integrate.simpson(I,x=x,axis=1)
+
+
+        self.cszfast_3c2vrms2 = np.interp(self.cszfast_pk_grid_z,z,np.log(vrms2*3.*Const._c_**2*1e-6))
+        return 0
 
 
     def calculate_sigma8_and_der(self,

{classy_szfast-0.0.25.post8 → classy_szfast-0.0.25.post10}/classy_szfast.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: classy_szfast
-Version: 0.0.25.post8
+Version: 0.0.25.post10
 Summary: The accelerator of the class_sz code from https://github.com/CLASS-SZ
 Maintainer-email: Boris Bolliet <bb667@cam.ac.uk>
 License: MIT
@@ -11,6 +11,6 @@ Requires-Dist: numpy>=1.19.0
 Requires-Dist: Cython>=0.29.21
 Requires-Dist: tensorflow
 Requires-Dist: mcfit
-Requires-Dist: get_cosmopower_emus
+Requires-Dist: get_cosmopower_emus==0.0.15
 Requires-Dist: class_sz_data
 Requires-Dist: cosmopower-jax

{classy_szfast-0.0.25.post8 → classy_szfast-0.0.25.post10}/classy_szfast.egg-info/requires.txt

@@ -2,6 +2,6 @@ numpy>=1.19.0
 Cython>=0.29.21
 tensorflow
 mcfit
-get_cosmopower_emus
+get_cosmopower_emus==0.0.15
 class_sz_data
 cosmopower-jax

{classy_szfast-0.0.25.post8 → classy_szfast-0.0.25.post10}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
-version = "0.0.25.post8"
+version = "0.0.25.post10"
 license = { text = "MIT" }
 name = "classy_szfast"
 maintainers = [{name = "Boris Bolliet",email="bb667@cam.ac.uk"}]
@@ -14,7 +14,7 @@ dependencies = [
     "Cython>=0.29.21",
     "tensorflow",
     "mcfit",
-    "get_cosmopower_emus",
+    "get_cosmopower_emus==0.0.15",
     "class_sz_data",
     "cosmopower-jax"
 ]