From 1ee353656a121fe1ddf0ef2b8891070ebfea5f64 Mon Sep 17 00:00:00 2001 From: Shreyas Tiruvaskar Date: Wed, 26 Feb 2025 14:19:14 +1300 Subject: [PATCH 1/3] Fixing errors in param_spaces_classic.py --- holodeck/librarian/param_spaces_classic.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/holodeck/librarian/param_spaces_classic.py b/holodeck/librarian/param_spaces_classic.py index 6f49331a..1d5b56dc 100644 --- a/holodeck/librarian/param_spaces_classic.py +++ b/holodeck/librarian/param_spaces_classic.py @@ -125,7 +125,7 @@ def __init__(self, log=None, nsamples=None, sam_shape=None, seed=None): PD_Uniform("hard_gamma_inner", -1.5, +0.5), # from `sam-parameters.ipynb` fits to [Tomczak+2014] with 4x stdev values - PD_Normal("gsmf_phi0", -2.56, 0.4), + PD_Normal("gsmf_phi0_log10", -2.56, 0.4), PD_Normal("gsmf_mchar0_log10", 10.9, 0.4), # [log10(Msol)] PD_Normal("gsmf_alpha0", -1.2, 0.2), @@ -151,7 +151,7 @@ class _PS_Classic_GWOnly(_Param_Space): DEFAULTS = dict( # Parameters are based on `sam-parameters.ipynb` fit to [Tomczak+2014] - gsmf_phi0=-2.77, + gsmf_phi0_log10=-2.77, gsmf_phiz=-0.6, gsmf_mchar0_log10=11.24, gsmf_mcharz=0.11, @@ -176,10 +176,10 @@ class _PS_Classic_GWOnly(_Param_Space): def __init__(self, log=None, nsamples=None, sam_shape=None, seed=None): parameters = [ - PD_Uniform("gsmf_phi0", -3.5, -1.5), + 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", +0.0, +1.2), + PD_Uniform("mmb_scatter_dex", +0.0, +1.2), ] super().__init__( parameters, @@ -190,7 +190,7 @@ def __init__(self, log=None, nsamples=None, sam_shape=None, seed=None): @classmethod def _init_sam(cls, sam_shape, params): gsmf = sams.GSMF_Schechter( - phi0=params['gsmf_phi0'], + phi0=params['gsmf_phi0_log10'], phiz=params['gsmf_phiz'], mchar0_log10=params['gsmf_mchar0_log10'], mcharz=params['gsmf_mcharz'], @@ -237,10 +237,10 @@ class PS_Classic_GWOnly_Uniform(_PS_Classic_GWOnly): def __init__(self, log=None, nsamples=None, sam_shape=None, seed=None): parameters = [ - PD_Uniform("gsmf_phi0", -3.5, -1.5), + 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", +0.0, +1.2), + PD_Uniform("mmb_scatter_dex", +0.0, +1.2), ] _Param_Space.__init__( self, parameters, @@ -259,7 +259,7 @@ class PS_Classic_GWOnly_Astro_Extended(_PS_Classic_GWOnly): def __init__(self, log=None, nsamples=None, sam_shape=None, seed=None): parameters = [ # from `sam-parameters.ipynb` fits to [Tomczak+2014] with 4x stdev values - PD_Normal("gsmf_phi0", -2.56, 0.4), + PD_Normal("gsmf_phi0_log10", -2.56, 0.4), PD_Normal("gsmf_mchar0_log10", 10.9, 0.4), # [log10(Msol)] PD_Normal("gsmf_alpha0", -1.2, 0.2), From c53e1f74f384bde692d15acced2d236225c16fc5 Mon Sep 17 00:00:00 2001 From: Laura Blecha Date: Fri, 16 May 2025 10:10:25 -0400 Subject: [PATCH 2/3] minor bugfix to add missing factor of 1/dlnf in definition of loud source strains in gravwaves._gws_harmonics_at_evo_fobs() --- holodeck/gravwaves.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/holodeck/gravwaves.py b/holodeck/gravwaves.py index 320670e4..bd1abf23 100644 --- a/holodeck/gravwaves.py +++ b/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: From 44fe30859d92832efa0b0513bd0b8a86968f189c Mon Sep 17 00:00:00 2001 From: Shreyas Tiruvaskar <153574373+shreyas-tiruvaskar@users.noreply.github.com> Date: Wed, 12 Nov 2025 09:31:00 +1300 Subject: [PATCH 3/3] Fix error in sams/components (#117) * Fixing errors in param_spaces_classic.py * Fix bug in sams/components.py --------- Co-authored-by: Shreyas Tiruvaskar --- holodeck/sams/components.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/holodeck/sams/components.py b/holodeck/sams/components.py index 9572d0bb..0891f4c6 100644 --- a/holodeck/sams/components.py +++ b/holodeck/sams/components.py @@ -164,7 +164,7 @@ def _phi_func(self, redz): def _mchar_func(self, redz): """See: [Chen2019]_ Eq.10 - NOTE: added `redz` term """ - return self._mchar0 + self._mcharz * redz + return self._mchar0 * np.power(10, self._mcharz * redz) def _alpha_func(self, redz): """See: [Chen2019]_ Eq.11