From 3ce453eeb5d2d05a746b178dac872d9363f8dfe1 Mon Sep 17 00:00:00 2001
From: David Hendriks <davidhendriks93@gmail.com>
Date: Thu, 29 Apr 2021 18:20:35 +0100
Subject: [PATCH] Updated code for M&S
---
binarycpython/utils/distribution_functions.py | 2 +-
binarycpython/utils/grid.py | 16 +++++++++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/binarycpython/utils/distribution_functions.py b/binarycpython/utils/distribution_functions.py
index 14e88af30..86f61a857 100644
--- a/binarycpython/utils/distribution_functions.py
+++ b/binarycpython/utils/distribution_functions.py
@@ -1107,7 +1107,7 @@ def Moe_de_Stefano_2017_multiplicity_fractions(options):
for key in result.keys():
result[key] = result[key] / sum_result
- print("Multiplicity array: {}".format(str(result)))
+ # print("Multiplicity array: {}".format(str(result)))
# return array reference
return result
diff --git a/binarycpython/utils/grid.py b/binarycpython/utils/grid.py
index 4d2a35edb..0fe333539 100644
--- a/binarycpython/utils/grid.py
+++ b/binarycpython/utils/grid.py
@@ -38,7 +38,6 @@ import argparse
import subprocess
import importlib.util
-
from typing import Union, Any
from pathos.helpers import mp as pathos_multiprocess
@@ -81,11 +80,14 @@ import binarycpython.utils.moe_distefano_data
# get_python_details,
# )
-from binarycpython.utils.distribution_functions import Moecache, LOG_LN_CONVERTER
+from binarycpython.utils.distribution_functions import (
+ Moecache,
+ LOG_LN_CONVERTER,
+ Moe_de_Stefano_2017_multiplicity_fractions
+)
from binarycpython import _binary_c_bindings
-
class Population:
"""
Population Object. Contains all the necessary functions to set up, run and process a
@@ -3037,6 +3039,14 @@ class Population:
triple_values = [multiplicity_dict[key][2] for key in multiplicity_dict.keys()]
quad_values = [multiplicity_dict[key][3] for key in multiplicity_dict.keys()]
+ print("mass = {}".format(list(mass_range)))
+ print("single_values={}".format(single_values))
+ print("binary_values={}".format(binary_values))
+ print("triple_values={}".format(triple_values))
+ print("quad_values={}".format(quad_values))
+
+
+
plt.plot(mass_range, single_values, label='single')
plt.plot(mass_range, binary_values, label='binary')
plt.plot(mass_range, triple_values, label='triple')
--
GitLab