diff --git a/holodeck/host_relations.py b/holodeck/host_relations.py index fed48c0b..b1c107f1 100644 --- a/holodeck/host_relations.py +++ b/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) diff --git a/holodeck/sams/sam.py b/holodeck/sams/sam.py index 3f691459..f8761dbc 100644 --- a/holodeck/sams/sam.py +++ b/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