diff --git a/nmma/em/model.py b/nmma/em/model.py index b59a7c673..64b55104b 100644 --- a/nmma/em/model.py +++ b/nmma/em/model.py @@ -97,6 +97,11 @@ "vej_wind", "KNtheta", ], + "LANL1D": [ + "Ye_wind", + "log10_mej_dyn", + "vej_dyn", + ], } @@ -108,6 +113,7 @@ def citation(self): citation_dict = { **dict.fromkeys(["LANLTP1", "LANLTP2", "LANLTS1", "LANLTS2"], ["https://arxiv.org/abs/2105.11543"]), "Ka2017": ["https://arxiv.org/abs/1710.05463"], + **dict.fromkeys(["LANL1D"] , ["https://arxiv.org/abs/1905.05089"]), **dict.fromkeys( ["Bu2019lm", "Bu2019lm_sparse"], ["https://arxiv.org/abs/2002.11355", "https://arxiv.org/abs/1906.04205"] ), diff --git a/nmma/em/model_parameters.py b/nmma/em/model_parameters.py index 01cdfee0f..980d79500 100644 --- a/nmma/em/model_parameters.py +++ b/nmma/em/model_parameters.py @@ -396,3 +396,26 @@ def LANLTS2(data): data_out[key] = {**data_out[key], **data[key]} return data_out, parameters + +def LANL1D(data): + + parameters = [ + "Ye_wind", + "log10_mej_dyn", + "vej_dyn", + ] + + data_out = {} + + magkeys = data.keys() + for jj, key in enumerate(magkeys): + knprops = get_knprops_from_LANLfilename(key) + + # best to interpolate masses in log10 + knprops["log10_mej_dyn"] = np.log10(knprops["mej_dyn"]) + del knprops["mej_dyn"] + + data_out[key] = knprops + data_out[key] = {**data_out[key], **data[key]} + + return data_out, parameters diff --git a/nmma/em/utils.py b/nmma/em/utils.py index 057e04c4c..a12327d2a 100644 --- a/nmma/em/utils.py +++ b/nmma/em/utils.py @@ -1649,7 +1649,8 @@ def get_knprops_from_LANLfilename(filename): md /= 100 elif md in [2]: md /= 1000 - + + # Record velocity elif "v" == info[0]: vd = float(info[1:]) / 100 @@ -1673,7 +1674,7 @@ def get_knprops_from_LANLfilename(filename): knprops = {} for prop in [ # "morphology", - # "Ye_wind", + "Ye_wind", "mej_dyn", "vej_dyn", "mej_wind", diff --git a/priors/LANL1D.prior b/priors/LANL1D.prior new file mode 100644 index 000000000..87afb5090 --- /dev/null +++ b/priors/LANL1D.prior @@ -0,0 +1,5 @@ +log10_mej_dyn = Uniform(name='log10_mej_dyn', minimum=-3., maximum=-1.2, latex_label='$\\log_{10}M^{\\rm{dyn}}_{\\rm{ej}}$') +vej_dyn = Uniform(name='vej_dyn', minimum=0.05, maximum=0.40, latex_label='$V^{\\rm{dyn}}_{\\rm{ej}}$') +Ye_wind = Uniform(name='Ye_wind', minimum=0.05, maximum=0.50, latex_label='$Y_{\\rm{e}}$') +luminosity_distance = 40.7 +timeshift = 0