classy-szfast 0.0.25.post7__py3-none-any.whl → 0.0.25.post9__py3-none-any.whl

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:
@@ -575,13 +585,17 @@ class Class_szfast(object):
         var = P.copy()
 
         dvar = P.copy()
+        # dvar_grads = P.copy()
 
         for iz,zp in enumerate(self.cszfast_pk_grid_z):
 
             R, var[:,iz] = TophatVar(k, lowring=True)(P[:,iz], extrap=True)
 
-            dvar[:,iz] = self.gradient(var[:,iz], R)
+            # dvar[:,iz] = self.gradient(var[:,iz], R) ## old form
+            _, dvar[:,iz] = TophatVar(k, lowring=True, deriv=1)(P[:,iz]*k, extrap=True) # new form 
 
+        # dvar = dvar/(2.*np.sqrt(var))
+        # print(dvar_grads/dvar)
         # print(k)
         # print(R)
         # print(k*R)
@@ -598,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.post7.dist-info → classy_szfast-0.0.25.post9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: classy_szfast
-Version: 0.0.25.post7
+Version: 0.0.25.post9
 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,7 +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: class-sz-data
+Requires-Dist: get_cosmopower_emus
+Requires-Dist: class_sz_data
 Requires-Dist: cosmopower-jax
-

{classy_szfast-0.0.25.post7.dist-info → classy_szfast-0.0.25.post9.dist-info}/RECORD

@@ -1,6 +1,6 @@
 classy_szfast/__init__.py,sha256=E2thrL0Z9oXFfdzwcsu-xbOytudLFTlRlPqVFGlPPPg,279
 classy_szfast/classy_sz.py,sha256=QmbwrSXInQLMvCDqsr7KPmtaU0KOiOt1Rb-cTKuulZw,22240
-classy_szfast/classy_szfast.py,sha256=bYxvdGz94Nk9zPwtMrEp0CGcn-nPayrZDH0q47HAKbg,41296
+classy_szfast/classy_szfast.py,sha256=ccKynjQks6nrPXa-eLREmCoIz_cl6e6dVJxdcdqavAE,42821
 classy_szfast/config.py,sha256=v6DGcBHmfn5JtuO48dKyXCh-Dmn0uwOF_izvVOJFnqw,279
 classy_szfast/cosmopower.py,sha256=ooYK2BDOZSo3XtGHfPtjXHxr5UW-yVngLPkb5gpvTx8,2351
 classy_szfast/cosmopower_jax.py,sha256=NqU_Sw5x0qw16DNHrN4ipCZP8HVdQvUiCq_Y04h8zoo,5468
@@ -14,7 +14,7 @@ classy_szfast/custom_bias/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 classy_szfast/custom_bias/custom_bias.py,sha256=aR2t5RTIwv7P0m2bsEU0Eq6BTkj4pG10AebH6QpG4qM,486
 classy_szfast/custom_profiles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 classy_szfast/custom_profiles/custom_profiles.py,sha256=4LZwb2XoqwCyWNmW2s24Z7AJdmgVdaRG7yYaBYe-d9Q,1188
-classy_szfast-0.0.25.post7.dist-info/METADATA,sha256=sIqiryp6dVpLkUbgautRNa5_Xzb6IRvaUaSNWGVsnZ4,548
-classy_szfast-0.0.25.post7.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-classy_szfast-0.0.25.post7.dist-info/top_level.txt,sha256=hRgqpilUck4lx2KkaWI2y9aCDKqF6pFfGHfNaoPFxv0,14
-classy_szfast-0.0.25.post7.dist-info/RECORD,,
+classy_szfast-0.0.25.post9.dist-info/METADATA,sha256=0AGVPnbd_om95RjxosZD_k_q6ORgzvv5rvrlaR1BGpw,547
+classy_szfast-0.0.25.post9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+classy_szfast-0.0.25.post9.dist-info/top_level.txt,sha256=hRgqpilUck4lx2KkaWI2y9aCDKqF6pFfGHfNaoPFxv0,14
+classy_szfast-0.0.25.post9.dist-info/RECORD,,

{classy_szfast-0.0.25.post7.dist-info → classy_szfast-0.0.25.post9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any