From 89872f51dad92d079206183da774d1df56628a3b Mon Sep 17 00:00:00 2001 From: David Hendriks <davidhendriks93@gmail.com> Date: Thu, 20 Feb 2020 17:37:48 +0000 Subject: [PATCH] updated grid and stellartypes --- binarycpython/utils/grid.py | 2 +- binarycpython/utils/stellar_types.py | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/binarycpython/utils/grid.py b/binarycpython/utils/grid.py index 4e667d2d1..ee822191c 100644 --- a/binarycpython/utils/grid.py +++ b/binarycpython/utils/grid.py @@ -188,10 +188,10 @@ class Population(object): valuerange, resolution, spacingfunc, - precode, probdist, dphasevol, parameter_name, + precode=None, condition=None, ): """spec diff --git a/binarycpython/utils/stellar_types.py b/binarycpython/utils/stellar_types.py index 21760e129..d18a63cf2 100644 --- a/binarycpython/utils/stellar_types.py +++ b/binarycpython/utils/stellar_types.py @@ -1,4 +1,4 @@ -stellar_type = { +stellar_type_dict = { 0: "low mass main sequence", 1: "Main Sequence", 2: "Hertzsprung Gap", @@ -16,3 +16,22 @@ stellar_type = { 14: "BLACK_HOLE", 15: "MASSLESS REMNANT", } + +stellar_type_dict_short = { + 0: "LMMS", + 1: "MS", + 2: "HG", + 3: "First Giant Branch", + 4: "CHeb", + 5: "EAGB", + 6: "TPAGB", + 7: "HeMS", + 8: "HeHG", + 9: "HeGB", + 10: "HeWD", + 11: "COWD", + 12: "ONeWD", + 13: "NS", + 14: "BH", + 15: "MR", +} -- GitLab