Update components.py

updated mbh_mass_func_conv to allow for evolving MMbulge

Author: CayenneMatt

holodeck/sams/components.py

@@ -147,9 +147,10 @@ def mbh_mass_func_conv(self, mbh, redz, mmbulge, scatter=None):
         mbh_log10 = np.log10(mbh/MSOL)
 
         bhmf_conv = np.zeros_like(mbh_log10)
+        logamp = np.log10((mmbulge._mamp * (1.0 + redz)**mmbulge._zplaw)/MSOL)
 
         for i, logMbh in enumerate(mbh_log10):
-            logMbh_mean = mmbulge._mamp_log10 + mmbulge._mplaw * (mstar_log10 - 11.0)
+            logMbh_mean = logamp + mmbulge._mplaw * (mstar_log10 - 11.0)
             pdf = stnorm.pdf(logMbh, loc=logMbh_mean, scale=scatter)
             bhmf_conv[i] = np.trapz(ndens * pdf, mstar_log10)