Commit a0bfc089 authored by David Hendriks's avatar David Hendriks
Browse files

Working on the last pieces of the probability. There is an issue with the amt of M1

parent e09f2cd9

binarycpython/utils/functions.py

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ def get_moe_distefano_dataset(options): 
    if not options.get("file", None):

        print("Using the default Moe and de Stefano 2017 datafile")



        json_data = moe_distefano_data.moe_distefano_2017_data

        json_data = copy.deepcopy(moe_distefano_data.moe_distefano_2017_data)



    else:

        if not os.path.isfile(options["file"]):

binarycpython/utils/grid.py

+6 −4
Original line number Diff line number Diff line
@@ -1641,6 +1641,11 @@ class Population: 
        # Clean up the interpolator functions

        self._clean_interpolators()



        # Also remove the rest of the contents

        keys_moecache = list(Moecache.keys())

        for key in keys_moecache:

            del Moecache[key]



    ###################################################

    # Gridcode functions

    #
@@ -3158,6 +3163,7 @@ class Population: 
        json_data = get_moe_distefano_dataset(options)



        # entry of log10M1 is a list containing 1 dict. We can take the dict out of the list

        

        json_data["log10M1"] = json_data["log10M1"][0]



        # Get all the masses
@@ -3775,7 +3781,3 @@ eccentricity3=0 
        for key in interpolator_keys:

            Moecache[key].destroy()

            del Moecache[key]