Merge branch 'dev' of github.com:nanograv/holodeck into dev

* 'dev' of github.com:nanograv/holodeck:
  Update param_spaces_classic.py
  Update try/except statement
  Add except statement to mbh_from_mbulge
  Add redz=redz as argument to dmstar_dmbh

holodeck/host_relations.py

@@ -843,7 +843,7 @@ def mbh_from_mbulge(self, mbulge, redz, scatter):
         # NOTE: this will work for (N,) ==> (N,)    or   (N,) ==> (N,X)
         try:
             redz = np.broadcast_to(redz, mbulge.T.shape).T
-        except TypeError:
+        except:
             redz = redz
         zmamp = self._mamp * (1.0 + redz)**self._zplaw
         mbh = _log10_relation(mbulge, zmamp, self._mplaw, scatter_dex, x0=self._mref)

holodeck/librarian/param_spaces_classic.py

@@ -100,8 +100,8 @@ def __init__(self, log=None, nsamples=None, sam_shape=None, seed=None):
         parameters = [
             PD_Uniform("gsmf_phi0_log10", -3.5, -1.5),
             PD_Uniform("gsmf_mchar0_log10", 10.5, 12.5),   # [log10(Msol)]
-            PD_Uniform("mmb_mamp_log10", +7.5, +9.5),      # [log10(Msol)]
-            PD_Uniform("mmb_scatter_dex", +0.0, +1.2),
+            PD_Uniform("mmb_mamp_log10", +7.6, +9.0),      # [log10(Msol)]
+            PD_Uniform("mmb_scatter_dex", +0.0, +0.9),
             PD_Uniform("hard_time", 0.1, 11.0),            # [Gyr]
             PD_Uniform("hard_gamma_inner", -1.5, +0.0),
         ]

holodeck/sams/sam.py

@@ -358,7 +358,7 @@ def static_binary_density(self):
             # ==> (dMstar-tot/dMbh-tot) = (dMstar-pri / dMbh-pri) * (dMbh-pri/dMbh-tot) / (dMstar-pri / dMstar-tot)
             #                           = (dMstar-pri / dMbh-pri) * (1 / (1+q_bh)) / (1 / (1+q_star))
             #                           = (dMstar-pri / dMbh-pri) * ((1+q_star) / (1+q_bh))
-            dmstar_dmbh_pri = self._mmbulge.dmstar_dmbh(mstar_pri)   # [unitless]
+            dmstar_dmbh_pri = self._mmbulge.dmstar_dmbh(mstar_pri, redz=redz)   # [unitless]
             qterm = (1.0 + mstar_rat) / (1.0 + self.mrat[np.newaxis, :, np.newaxis])
             dmstar_dmbh = dmstar_dmbh_pri * qterm