fixing typo and checking things with Siyuan

models/galaxy_model/mergerrate.py

@@ -23,12 +23,12 @@ def dtdz(z):
 
 def dVcdz(z):
 	c = const.c.value  # 3.e8
-	H0 = cosmo.H(0).value*1.e3 # 70.e3 -> check with Siyuan
+	H0 = cosmo.H(0).value*1.e3 # 70.e3 
 	return 4.*np.pi*c/H0*invE(z)*DM(z)*DM(z)
 
 def DM(z):
 	c = const.c.value   # 3.e8
-	H0 = cosmo.H(0).value*1.e3 # 70.e3 -> check with Siyuan
+	H0 = cosmo.H(0).value*1.e3 # 70.e3 
 	return c/H0*si.quad(invE, 0., z)[0]
 
 def mchirpq(q):
@@ -53,7 +53,7 @@ def mfractionp(m):
 #spectrum computation functions begin
 
 Gu = const.G.value                # 6.673848e-11
-cu = const.G.value                # 2.997925e8
+cu = const.c.value                # 2.997925e8
 Msun = const.M_sun.value          # 1.98855e30
 pc = 1.*u.parsec.to(u.m)          # 3.0856776e16
 Gyr = 1.e9 * 1.*u.year.to(u.s)    # 3.15576e16
@@ -404,8 +404,8 @@ class mergerrate(object):
 	def hdrop(self,n0,f,fbin):
 		if fbin is None:
 			return n0
-		c = const.c.value   # 3.e8
-		G = 1.33e20 # should we use const.G.value here too (not sure what the unit is here)
+		c = cu   # 3.e8
+		G = const.G.value*const.M_sun.value  # 1.33e20 
 		fhigh = f + fbin
 		flow = f - fbin
 		Mcbh = np.linspace(5,11,30)