Cleanup

nanograv · Feb 17, 2024 · 809f1a2 · 809f1a2
1 parent 2e54b63
commit 809f1a2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/holodeck/sams/comps.py b/holodeck/sams/comps.py
@@ -385,36 +385,37 @@ class GMR_Illustris(_Galaxy_Merger_Rate):
 
     """
 
-    def __init__(self,
-                 norm0_log10=None,
-                 normz=None,
-                 malpha0=None,
-                 malphaz=None,
-                 mdelta0=None,
-                 mdeltaz=None,
-                 qgamma0=None,
-                 qgammaz=None,
-                 qgammam=None,
-                 ):
+    def __init__(
+        self,
+        norm0_log10=None,
+        normz=None,
+        malpha0=None,
+        malphaz=None,
+        mdelta0=None,
+        mdeltaz=None,
+        qgamma0=None,
+        qgammaz=None,
+        qgammam=None,
+    ):
 
         if norm0_log10 is None:
-            norm0_log10 = -2.2287      # -2.2287 ± 0.0045    [log10(A*Gyr)]  A0 in [RG15]
+            norm0_log10 = -2.2287      # -2.2287 ± 0.0045    A0 [log10(A*Gyr)]
         if normz is None:
-            normz = +2.4644            # +2.4644 ± 0.0128    eta in [RG15]
+            normz = +2.4644            # +2.4644 ± 0.0128    eta
         if malpha0 is None:
-            malpha0 = +0.2241          # +0.2241 ± 0.0038    alpha0 in [RG15]
+            malpha0 = +0.2241          # +0.2241 ± 0.0038    alpha0
         if malphaz is None:
-            malphaz = -1.1759          # -1.1759 ± 0.0316    alpha1 in [RG15]
+            malphaz = -1.1759          # -1.1759 ± 0.0316    alpha1
         if mdelta0 is None:
-            mdelta0 = +0.7668          # +0.7668 ± 0.0202    delta0 in [RG15]
+            mdelta0 = +0.7668          # +0.7668 ± 0.0202    delta0
         if mdeltaz is None:
-            mdeltaz = -0.4695          # -0.4695 ± 0.0440    delta1 in [RG15]
+            mdeltaz = -0.4695          # -0.4695 ± 0.0440    delta1
         if qgamma0 is None:
-            qgamma0 = -1.2595          # -1.2595 ± 0.0026    beta0 in [RG15]
+            qgamma0 = -1.2595          # -1.2595 ± 0.0026    beta0
         if qgammaz is None:
-            qgammaz = +0.0611          # +0.0611 ± 0.0021    beta1 in [RG15]
+            qgammaz = +0.0611          # +0.0611 ± 0.0021    beta1
         if qgammam is None:
-            qgammam = -0.0477          # -0.0477 ± 0.0013    gamma in [RG15]
+            qgammam = -0.0477          # -0.0477 ± 0.0013    gamma
 
         self._norm0 = (10.0 ** norm0_log10) / GYR              # [1/sec]
         self._normz = normz

diff --git a/holodeck/sams/sam.py b/holodeck/sams/sam.py
@@ -157,7 +157,7 @@ def __init__(
             if shape is not None:
                 if shape[ii] is not None:
                     par[2] = shape[ii]
-            params[ii] = np.logspace(*np.log10(par[:2]), par[2]+1)
+            params[ii] = np.logspace(*np.log10(par[:2]), par[2])
             log.debug(f"{name}: [{params[ii][0]}, {params[ii][-1]}] {params[ii].size}")
 
         mtot, mrat, redz = params