From 747f9af0331ad060cd10047b445a8249935b38ef Mon Sep 17 00:00:00 2001 From: David Hendriks <davidhendriks93@gmail.com> Date: Wed, 28 Apr 2021 18:50:31 +0100 Subject: [PATCH] small changes --- binarycpython/utils/distribution_functions.py | 10 ++--- binarycpython/utils/grid.py | 44 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/binarycpython/utils/distribution_functions.py b/binarycpython/utils/distribution_functions.py index 4756f125a..14e88af30 100644 --- a/binarycpython/utils/distribution_functions.py +++ b/binarycpython/utils/distribution_functions.py @@ -952,11 +952,11 @@ def poisson(lambda_val, n, nmax=None): if distribution_constants.get("poisson_cache", None): if distribution_constants["poisson_cache"].get(cachekey, None): p_val = distribution_constants["poisson_cache"][cachekey] - print( - "Found cached value: Poisson ({}, {}, {}) = {}\n".format( - lambda_val, n, nmax, p_val - ) - ) + # print( + # "Found cached value: Poisson ({}, {}, {}) = {}\n".format( + # lambda_val, n, nmax, p_val + # ) + # ) return p_val # Poisson distribution : note, n can be zero diff --git a/binarycpython/utils/grid.py b/binarycpython/utils/grid.py index 8a004d14a..4d2a35edb 100644 --- a/binarycpython/utils/grid.py +++ b/binarycpython/utils/grid.py @@ -3022,28 +3022,28 @@ class Population: # # multiplicity_fractions = Moe_de_Stefano_2017_multiplicity_fractions(options) - # import matplotlib.pyplot as plt - - # mass_range = range(1, 80) - - # multiplicity_dict = {} - # for mass in mass_range: - # options['M1'] = mass - # multiplicity_fractions = Moe_de_Stefano_2017_multiplicity_fractions(options) - # multiplicity_dict[mass] = multiplicity_fractions - - # single_values = [multiplicity_dict[key][0] for key in multiplicity_dict.keys()] - # binary_values = [multiplicity_dict[key][1] for key in multiplicity_dict.keys()] - # triple_values = [multiplicity_dict[key][2] for key in multiplicity_dict.keys()] - # quad_values = [multiplicity_dict[key][3] for key in multiplicity_dict.keys()] - - # plt.plot(mass_range, single_values, label='single') - # plt.plot(mass_range, binary_values, label='binary') - # plt.plot(mass_range, triple_values, label='triple') - # plt.plot(mass_range, quad_values, label='Quadruple') - # plt.legend() - # plt.xscale('log') - # plt.show() + import matplotlib.pyplot as plt + + mass_range = range(1, 80) + + multiplicity_dict = {} + for mass in mass_range: + options['M1'] = mass + multiplicity_fractions = Moe_de_Stefano_2017_multiplicity_fractions(options) + multiplicity_dict[mass] = multiplicity_fractions + + single_values = [multiplicity_dict[key][0] for key in multiplicity_dict.keys()] + binary_values = [multiplicity_dict[key][1] for key in multiplicity_dict.keys()] + triple_values = [multiplicity_dict[key][2] for key in multiplicity_dict.keys()] + quad_values = [multiplicity_dict[key][3] for key in multiplicity_dict.keys()] + + plt.plot(mass_range, single_values, label='single') + plt.plot(mass_range, binary_values, label='binary') + plt.plot(mass_range, triple_values, label='triple') + plt.plot(mass_range, quad_values, label='Quadruple') + plt.legend() + plt.xscale('log') + plt.show() ############################################################ # construct the grid here -- GitLab