GSMF alpha2 fix

docs/source/getting_started/nanograv_15yr.rst

@@ -20,3 +20,7 @@ The initial set of **NANOGrav 15yr papers** are:
 
 The use of **holodeck in the 15yr astrophysics interpretation**:
 
+
+Errata
+======
+[1] : The 15yr Astro paper quotes an initial separation (the ``hard_sepa_init`` parameter) of "1e3 pc", this is incorrect and the actual value used in the analysis was 1e4 pc.  The values in the parameter-space objects (i.e. :py:class:`~holodeck.librarian.param_spaces_classic:_PS_Classic_Phenom`) is correct.

holodeck/__init__.py

@@ -31,6 +31,10 @@
     evolution.  Note that GWs can only be calculated based on some sort of model for binary
     evolution.  The model may be extremely simple, in which case it is sometimes glanced over.
 
+References
+----------
+* [WMAP9] Hinshaw, Larson, Komatsu et al. 2013
+
 """
 
 __author__ = "NANOGrav"
@@ -44,6 +48,8 @@
 
 # ---- Define Global Parameters
 
+LOG_SUFFIX = '.log'
+LOG_FILENAME_WITH_TIME_STAMP = False
 
 class Parameters:
     """These are WMAP9 parameters, see: [WMAP9]_ Table 3, WMAP+BAO+H0
@@ -60,6 +66,7 @@ class Parameters:
 _PATH_NOTEBOOKS = os.path.join(_PATH_ROOT, "notebooks", "")
 _PATH_DATA = os.path.join(_PATH_PACKAGE, "data", "")
 _PATH_OUTPUT = os.path.join(_PATH_ROOT, "output", "")
+_PATH_LOGS = os.path.join(_PATH_OUTPUT, "logs", "")
 
 # NOTE: can only search for paths within the package _*NOT the root directory*_
 _check_paths = [_PATH_PACKAGE, _PATH_ROOT, _PATH_DATA]
@@ -73,7 +80,14 @@ class Parameters:
 # ---- Load logger
 
 from . import logger   # noqa
-log = logger.get_logger(__name__, logging.WARNING)       #: global root logger from `holodeck.logger`
+log = logger.get_logger(__name__, level_stream=logging.WARNING)       #: global root logger from `holodeck.logger`
+log.setLevel(logging.WARNING)
+
+def log_to_file(**kwargs):
+    logger.log_to_file(log, **kwargs)
+
+def set_log_level(level):
+    log.setLevel(level)
 
 # ---- Load cosmology instance
 

holodeck/discrete/population.py

@@ -316,7 +316,7 @@ def __init__(self, fname=None, **kwargs):
         """
         if fname is None:
             fname = _DEF_ILLUSTRIS_FNAME
-            fname = os.path.join(_PATH_DATA, fname)
+            fname = os.path.join(_PATH_DATA, "illustris", fname)
 
         self._fname = fname             #: Filename for binary data
         super().__init__(**kwargs)

holodeck/gravwaves.py

@@ -273,7 +273,7 @@ def _gws_harmonics_at_evo_fobs(fobs_gw, dlnf, evo, harm_range, nreals, box_vol,
 
     if np.any(num_pois > 0):
         # Find the L loudest binaries in each realizations
-        loud = np.sort(temp[:, np.newaxis] * (num_pois > 0), axis=0)[::-1, :]
+        loud = np.sort(temp[:, np.newaxis] * (num_pois > 0) / dlnf, axis=0)[::-1, :]
         fore = loud[0, :]
         loud = loud[:loudest, :]
     else:

holodeck/host_relations.py

@@ -696,9 +696,11 @@ def __init__(
             scatter_dex = self.SCATTER_DEX
 
         self._mamp = mamp                   #: Mass-Amplitude [grams]
+        self._mamp_log10 = mamp_log10       #: log10 of Mass-Amplitude [log10(Msol)]
         self._mplaw = mplaw                 #: Mass Power-law index
         self._mref = mref                   #: Reference Mass (argument normalization)
         self._scatter_dex = scatter_dex
+        self._zplaw = 0.0
 
         if len(kwargs) > 0:
             warn = f"Unused parameters passed to {self}!  {kwargs=}"

holodeck/librarian/combine.py

@@ -125,7 +125,7 @@ def sam_lib_combine(
     lib_path = lib_tools.get_sam_lib_fname(path_output, gwb_only, library=library)
     if lib_path.exists():
         lvl = log.INFO if recreate else log.WARNING
-        log.log(lvl, f"combined library already exists: {lib_path}, run with `-r` to recreate.")
+        log.log(lvl, f"Combined library already exists: {lib_path}, run with `-r` to recreate.")
         if not recreate:
             return
 
@@ -135,7 +135,7 @@ def sam_lib_combine(
 
     if path_pspace is None:
         path_pspace = path_output
-    pspace, pspace_fname = lib_tools.load_pspace_from_path(path_pspace, log=log)
+    pspace, pspace_fname = lib_tools.load_pspace_from_path(path_pspace)
     args, args_fname = holo.librarian.gen_lib.load_config_from_path(path_pspace, log=log)
 
     log.info(f"loaded param space: {pspace} from '{pspace_fname}'")