WantCls=False; tidy; new feedback benchmarks

Author: alexander-mead

hmcode/camb_stuff.py

@@ -2,16 +2,17 @@
 import camb
 
 def run(zs, Omega_c, Omega_b, Omega_k, h, ns, sigma_8, 
-    m_nu=0., w=-1., wa=0., As=2e-9, norm_sigma8=True, kmax_CAMB=200., 
-    log10_T_AGN=None, verbose=False):
+    m_nu=0., w=-1., wa=0., log10_T_AGN=None,
+    As=2e-9, norm_sigma8=True, kmax_CAMB=200., verbose=False):
 
     # Sets cosmological parameters in camb to calculate the linear power spectrum
+    # TODO: Setting 'WantCls=False' in CAMBparams spoils the agreement... why?
     if log10_T_AGN:
         non_linear_model = camb.nonlinear.Halofit(halofit_version="mead2020_feedback", 
                                                   HMCode_logT_AGN=log10_T_AGN)
     else:
         non_linear_model = camb.nonlinear.Halofit(halofit_version="mead2020")
-    pars = camb.CAMBparams(WantCls=False, NonLinearModel=non_linear_model)
+    pars = camb.CAMBparams(NonLinearModel=non_linear_model) 
     wb, wc = Omega_b*h**2, Omega_c*h**2
 
     # This function sets standard and helium set using BBN consistency

hmcode/linear_growth.py

@@ -1,27 +1,27 @@
 # Third-party imports
 import numpy as np
-import camb
+from camb import CAMBdata
 
 # Parameters
 a_init = 1e-4 # Initial scale-factor for growth ODE integration
 
-def _w(a:float, CAMB_results:camb.CAMBdata, LCDM=False) -> float:
+def _w(a:float, CAMB_results:CAMBdata, LCDM=False) -> float:
     '''
     Dark energy equation of state for w0, wa models
     '''
     w0, wa = (-1., 0.) if LCDM else (CAMB_results.Params.DarkEnergy.w, CAMB_results.Params.DarkEnergy.wa)
     return w0+(1.-a)*wa
 
 
-def _X_w(a:float, CAMB_results:camb.CAMBdata, LCDM=False) -> float:
+def _X_w(a:float, CAMB_results:CAMBdata, LCDM=False) -> float:
     '''
     Cosmological dark energy density for w0, wa models
     '''
     w0, wa = (-1., 0.) if LCDM else (CAMB_results.Params.DarkEnergy.w, CAMB_results.Params.DarkEnergy.wa)
     return a**(-3.*(1.+w0+wa))*np.exp(-3.*wa*(1.-a))
 
 
-def _Omega_m(a:float, CAMB_results:camb.CAMBdata, LCDM=False) -> float:
+def _Omega_m(a:float, CAMB_results:CAMBdata, LCDM=False) -> float:
     '''
     Evolution of Omgea_m with scale-factor ignoring radiation
     '''
@@ -32,7 +32,7 @@ def _Omega_m(a:float, CAMB_results:camb.CAMBdata, LCDM=False) -> float:
     return Om_m*a**-3/_Hubble2(a, CAMB_results, LCDM)
 
 
-def _Hubble2(a:float, CAMB_results:camb.CAMBdata, LCDM=False) -> float:
+def _Hubble2(a:float, CAMB_results:CAMBdata, LCDM=False) -> float:
     '''
     Squared Hubble parameter ignoring radiation
     Massive neutrinos are counted as 'matter'
@@ -47,7 +47,7 @@ def _Hubble2(a:float, CAMB_results:camb.CAMBdata, LCDM=False) -> float:
     return H2
 
 
-def _AH(a:float, CAMB_results:camb.CAMBdata, LCDM=False) -> float:
+def _AH(a:float, CAMB_results:CAMBdata, LCDM=False) -> float:
     '''
     Acceleration parameter ignoring radiation
     Massive neutrinos are counted as 'matter'
@@ -61,7 +61,7 @@ def _AH(a:float, CAMB_results:camb.CAMBdata, LCDM=False) -> float:
     return AH
 
 
-def get_growth_interpolator(CAMB_results:camb.CAMBdata, LCDM=False) -> callable:
+def get_growth_interpolator(CAMB_results:CAMBdata, LCDM=False) -> callable:
     '''
     Solve the linear growth ODE and returns an interpolating function for the solution
     LCDM = True forces w = -1 and imposes flatness by modifying the dark-energy density