From 84b90a9b1ca12fcc87c57e0374b08577e63ccc57 Mon Sep 17 00:00:00 2001 From: Segev BenZvi Date: Sat, 25 May 2019 11:58:43 -0400 Subject: [PATCH 1/8] Enable model conversion to str. --- python/asteria/stellardist.py | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/python/asteria/stellardist.py b/python/asteria/stellardist.py index 9ace5c6..b1e4b1d 100644 --- a/python/asteria/stellardist.py +++ b/python/asteria/stellardist.py @@ -38,6 +38,11 @@ def distance(self, size=1): """ pass + @abstractmethod + def __str__(self): + """Express as a string.""" + pass + class FixedDistance(Distance): """Generate fixed distances for the progenitor.""" @@ -76,6 +81,19 @@ def distance(self, size=1): return d * self.dist.unit + def __str__(self): + """Express as a string. + + Returns + ------- + s : str + String representation of FixedDistance. + """ + s = 'Fixed Distance:\n- distance = {}'.format(self.dist) + if self.sigma is not None: + s += '\n- sigma = {}'.format(self.sigma) + return s + class StellarDensity(Distance): """Generate distances according to a Sun-centric radial mass density.""" @@ -100,6 +118,8 @@ def __init__(self, distcdf_file, add_LMC=False, add_SMC=False): self.cdf = hdu['CDF'].data self.name = hdu['CDF'].header['NAME'] self.publication = hdu['CDF'].header['PUB'] + self.use_LMC = add_LMC + self.use_SMC = add_SMC # Virial mass of the MW is ~1.5e12 Msun; see L. Watkins et al., # ApJ 873:118 (2019), arXiv:1804.11348 [astro-ph.GA]. @@ -159,3 +179,18 @@ def distance(self, size=1): u = np.random.uniform(0.,1., size) return self._inv_cdf(u) * self.dist.unit + def __str__(self): + """Express as a string. + + Returns + ------- + s : str + String representation of StellarDensity. + """ + s = 'Stellar density:\n' + s += '- model = {}\n'.format(self.name) + s += '- paper = {}\n'.format(self.publication) + s += '- use LMC = {}\n'.format(self.use_LMC) + s += '- use SMC = {}'.format(self.use_SMC) + return s + From bb6c337e3e64a8bcdb984709f70d30f209d14b84 Mon Sep 17 00:00:00 2001 From: Segev BenZvi Date: Sun, 26 May 2019 10:48:08 -0400 Subject: [PATCH 2/8] Fix typo in pydocs. --- python/asteria/stellardist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/asteria/stellardist.py b/python/asteria/stellardist.py index b1e4b1d..5480eed 100644 --- a/python/asteria/stellardist.py +++ b/python/asteria/stellardist.py @@ -17,7 +17,7 @@ class Distance(ABC): - """Basic abstrct class to generate progenitor distance(s). + """Abstract base class for generating progenitor distance(s). """ def __init__(self): super().__init__() From c3fc55fd53b4a0946460dda2a439d49285b86a0d Mon Sep 17 00:00:00 2001 From: Segev BenZvi Date: Sun, 26 May 2019 19:13:45 -0400 Subject: [PATCH 3/8] Use distance models from stellardist module. --- python/asteria/source.py | 46 ++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/python/asteria/source.py b/python/asteria/source.py index 75c7f77..791290c 100644 --- a/python/asteria/source.py +++ b/python/asteria/source.py @@ -10,6 +10,7 @@ from __future__ import print_function, division from .neutrino import Flavor +from .stellardist import FixedDistance, StellarDensity from .config import parse_quantity from astropy import units as u @@ -24,11 +25,12 @@ class Source: - def __init__(self, name, model, progenitor_mass, progenitor_distance, + def __init__(self, name, + spectral_model, progenitor_mass, progenitor_distance, time={}, luminosity={}, mean_energy={}, pinch={}): self.name = name - self.model = model + self.model = spectral_model self.progenitor_mass = progenitor_mass self.progenitor_distance = progenitor_distance self.time = time @@ -46,14 +48,13 @@ def __init__(self, name, model, progenitor_mass, progenitor_distance, self.v_energy_pdf = np.vectorize(self.energy_pdf, excluded=['E'], signature='(1,n),(1,n)->(m,n)' ) # Energy CDF, useful for random energy sampling. - self.energy_cdf = lambda a, Ea, E: gdtr(1., a + 1., (a + 1.) * (E / Ea)) - + self.energy_cdf = lambda a, Ea, E: gdtr(1., a + 1., (a + 1.) * (E / Ea)) + def parts_by_index(self, x, n): """Returns a list of size-n numpy arrays containing indices for the elements of x, and one size-m array ( with m Date: Sun, 26 May 2019 19:14:10 -0400 Subject: [PATCH 4/8] Change test to default.yaml; use stellardist. --- data/config/{test.yaml => default.yaml} | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) rename data/config/{test.yaml => default.yaml} (79%) diff --git a/data/config/test.yaml b/data/config/default.yaml similarity index 79% rename from data/config/test.yaml rename to data/config/default.yaml index 5363f30..128f9f9 100644 --- a/data/config/test.yaml +++ b/data/config/default.yaml @@ -32,7 +32,15 @@ source: model: Sukhbold 9.6Msun progenitor with SFHo equation of state progenitor: mass: 9.6 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance_model: FixedDistance + distance : 10 kpc + uncertainty : 0 kpc +# distance_model: StellarDensity +# format: fits +# path: stellar/sn_radial_distrib_adams.fits +# add_LMC: False +# add_SMC: False table: format: fits path: spectra/sukhbold-SFHo-z9.6.fits From 9f1a8db01a15013755b686880d11d4ecba25123d Mon Sep 17 00:00:00 2001 From: Segev BenZvi Date: Sun, 26 May 2019 19:30:14 -0400 Subject: [PATCH 5/8] Change default.yaml back to test.yaml. --- data/config/{default.yaml => test.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename data/config/{default.yaml => test.yaml} (100%) diff --git a/data/config/default.yaml b/data/config/test.yaml similarity index 100% rename from data/config/default.yaml rename to data/config/test.yaml From e6d1b3b14615025fa9e77e8335de6413c2aa42a0 Mon Sep 17 00:00:00 2001 From: Segev BenZvi Date: Mon, 27 May 2019 07:11:40 -0400 Subject: [PATCH 6/8] Correct format error in test.yaml. --- data/config/test.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/data/config/test.yaml b/data/config/test.yaml index 128f9f9..a00cbff 100644 --- a/data/config/test.yaml +++ b/data/config/test.yaml @@ -33,11 +33,12 @@ source: progenitor: mass: 9.6 M_sun # Distance model: can be FixedDistance or StellarDensity - distance_model: FixedDistance - distance : 10 kpc - uncertainty : 0 kpc -# distance_model: StellarDensity -# format: fits + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc +# distance +# model: StellarDensity # path: stellar/sn_radial_distrib_adams.fits # add_LMC: False # add_SMC: False From 2baf0c8156f906e93612a60d7ba1116d09be4a90 Mon Sep 17 00:00:00 2001 From: Segev BenZvi Date: Mon, 27 May 2019 07:12:50 -0400 Subject: [PATCH 7/8] Change names of yaml variables. --- python/asteria/source.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/python/asteria/source.py b/python/asteria/source.py index 791290c..e936917 100644 --- a/python/asteria/source.py +++ b/python/asteria/source.py @@ -326,18 +326,18 @@ def initialize(config): # Set up the distance model. distance_model = None - dmtype = config.source.progenitor.distance_model + dmtype = config.source.progenitor.distance.model if dmtype == 'FixedDistance': # FixedDistance model. - r = parse_quantity(config.source.progenitor.distance_model.distance) - dr = parse_quantity(config.source.progenitor.distance_model.uncertainty) + r = parse_quantity(config.source.progenitor.distance.distance) + dr = parse_quantity(config.source.progenitor.distance.uncertainty) distance_model = FixedDistance(r, dr) elif dmtype == 'StellarDensity': # StellarDensity model, with options to add LMC and SMC. fitsfile = '/'.join([config.abs_base_path, - config.source.progenitor.distance_model.path]) - lmc = parse_quantity(config.source.progenitor.distance_model.add_LMC) - smc = parse_quantity(config.source.progenitor.distance_model.add_SMC) + config.source.progenitor.distance.path]) + lmc = parse_quantity(config.source.progenitor.distance.add_LMC) + smc = parse_quantity(config.source.progenitor.distance.add_SMC) distance_model = StellarDensity(fitsfile, lmc, smc) else: raise ValueError('Unrecognized distance_model: {}'.format(dmtype)) From aa2d9f8aae959e37bd87c0ff76cef860c84e6674 Mon Sep 17 00:00:00 2001 From: Segev BenZvi Date: Mon, 27 May 2019 07:17:03 -0400 Subject: [PATCH 8/8] Use updated distance model. --- data/config/nakazato-LS220-BH-z0.004-s30.0.yaml | 6 +++++- data/config/nakazato-shen-BH-z0.004-s30.0.yaml | 6 +++++- data/config/nakazato-shen-z0.004-t_rev100ms-s13.0.yaml | 6 +++++- data/config/nakazato-shen-z0.004-t_rev100ms-s20.0.yaml | 6 +++++- data/config/nakazato-shen-z0.004-t_rev100ms-s50.0.yaml | 6 +++++- data/config/nakazato-shen-z0.004-t_rev200ms-s13.0.yaml | 6 +++++- data/config/nakazato-shen-z0.004-t_rev200ms-s20.0.yaml | 6 +++++- data/config/nakazato-shen-z0.004-t_rev200ms-s50.0.yaml | 6 +++++- data/config/nakazato-shen-z0.004-t_rev300ms-s13.0.yaml | 6 +++++- data/config/nakazato-shen-z0.004-t_rev300ms-s20.0.yaml | 6 +++++- data/config/nakazato-shen-z0.004-t_rev300ms-s50.0.yaml | 6 +++++- data/config/nakazato-shen-z0.02-t_rev100ms-s13.0.yaml | 6 +++++- data/config/nakazato-shen-z0.02-t_rev100ms-s20.0.yaml | 6 +++++- data/config/nakazato-shen-z0.02-t_rev100ms-s30.0.yaml | 6 +++++- data/config/nakazato-shen-z0.02-t_rev100ms-s50.0.yaml | 6 +++++- data/config/nakazato-shen-z0.02-t_rev200ms-s13.0.yaml | 6 +++++- data/config/nakazato-shen-z0.02-t_rev200ms-s20.0.yaml | 6 +++++- data/config/nakazato-shen-z0.02-t_rev200ms-s30.0.yaml | 6 +++++- data/config/nakazato-shen-z0.02-t_rev200ms-s50.0.yaml | 6 +++++- data/config/nakazato-shen-z0.02-t_rev300ms-s13.0.yaml | 6 +++++- data/config/nakazato-shen-z0.02-t_rev300ms-s20.0.yaml | 6 +++++- data/config/nakazato-shen-z0.02-t_rev300ms-s30.0.yaml | 6 +++++- data/config/nakazato-shen-z0.02-t_rev300ms-s50.0.yaml | 6 +++++- 23 files changed, 115 insertions(+), 23 deletions(-) diff --git a/data/config/nakazato-LS220-BH-z0.004-s30.0.yaml b/data/config/nakazato-LS220-BH-z0.004-s30.0.yaml index 257b032..7fe758c 100644 --- a/data/config/nakazato-LS220-BH-z0.004-s30.0.yaml +++ b/data/config/nakazato-LS220-BH-z0.004-s30.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato Black hole formation from 30.0Msun progenitor with Lattimer-Swesty equation of state and metallicity z=0.004 progenitor: mass: 30.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-LS220-BH-z0.004-s30.0.fits diff --git a/data/config/nakazato-shen-BH-z0.004-s30.0.yaml b/data/config/nakazato-shen-BH-z0.004-s30.0.yaml index 44adc36..b3a4463 100644 --- a/data/config/nakazato-shen-BH-z0.004-s30.0.yaml +++ b/data/config/nakazato-shen-BH-z0.004-s30.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato Black hole formation from 30.0Msun progenitor with Shen equation of state and metallicity z=0.004 progenitor: mass: 30.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-BH-z0.004-s30.0.fits diff --git a/data/config/nakazato-shen-z0.004-t_rev100ms-s13.0.yaml b/data/config/nakazato-shen-z0.004-t_rev100ms-s13.0.yaml index 560a2c7..9e8ed30 100644 --- a/data/config/nakazato-shen-z0.004-t_rev100ms-s13.0.yaml +++ b/data/config/nakazato-shen-z0.004-t_rev100ms-s13.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 13.0Msun progenitor with Shen equation of state, metallicity z=0.004 and shock revival time t_rev=100ms progenitor: mass: 13.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.004-t_rev100ms-s13.0.fits diff --git a/data/config/nakazato-shen-z0.004-t_rev100ms-s20.0.yaml b/data/config/nakazato-shen-z0.004-t_rev100ms-s20.0.yaml index ba7ab31..cb82069 100644 --- a/data/config/nakazato-shen-z0.004-t_rev100ms-s20.0.yaml +++ b/data/config/nakazato-shen-z0.004-t_rev100ms-s20.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 20.0Msun progenitor with Shen equation of state, metallicity z=0.004 and shock revival time t_rev=100ms progenitor: mass: 20.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.004-t_rev100ms-s20.0.fits diff --git a/data/config/nakazato-shen-z0.004-t_rev100ms-s50.0.yaml b/data/config/nakazato-shen-z0.004-t_rev100ms-s50.0.yaml index 151ce7a..d1a3242 100644 --- a/data/config/nakazato-shen-z0.004-t_rev100ms-s50.0.yaml +++ b/data/config/nakazato-shen-z0.004-t_rev100ms-s50.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 50.0Msun progenitor with Shen equation of state, metallicity z=0.004 and shock revival time t_rev=100ms progenitor: mass: 50.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.004-t_rev100ms-s50.0.fits diff --git a/data/config/nakazato-shen-z0.004-t_rev200ms-s13.0.yaml b/data/config/nakazato-shen-z0.004-t_rev200ms-s13.0.yaml index 4c2fcf1..1eaf9da 100644 --- a/data/config/nakazato-shen-z0.004-t_rev200ms-s13.0.yaml +++ b/data/config/nakazato-shen-z0.004-t_rev200ms-s13.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 13.0Msun progenitor with Shen equation of state, metallicity z=0.004 and shock revival time t_rev=200ms progenitor: mass: 13.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.004-t_rev200ms-s13.0.fits diff --git a/data/config/nakazato-shen-z0.004-t_rev200ms-s20.0.yaml b/data/config/nakazato-shen-z0.004-t_rev200ms-s20.0.yaml index 920c693..753c41b 100644 --- a/data/config/nakazato-shen-z0.004-t_rev200ms-s20.0.yaml +++ b/data/config/nakazato-shen-z0.004-t_rev200ms-s20.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 20.0Msun progenitor with Shen equation of state, metallicity z=0.004 and shock revival time t_rev=200ms progenitor: mass: 20.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.004-t_rev200ms-s20.0.fits diff --git a/data/config/nakazato-shen-z0.004-t_rev200ms-s50.0.yaml b/data/config/nakazato-shen-z0.004-t_rev200ms-s50.0.yaml index 390c015..73ca89f 100644 --- a/data/config/nakazato-shen-z0.004-t_rev200ms-s50.0.yaml +++ b/data/config/nakazato-shen-z0.004-t_rev200ms-s50.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 50.0Msun progenitor with Shen equation of state, metallicity z=0.004 and shock revival time t_rev=200ms progenitor: mass: 50.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.004-t_rev200ms-s50.0.fits diff --git a/data/config/nakazato-shen-z0.004-t_rev300ms-s13.0.yaml b/data/config/nakazato-shen-z0.004-t_rev300ms-s13.0.yaml index 12197ed..db693a8 100644 --- a/data/config/nakazato-shen-z0.004-t_rev300ms-s13.0.yaml +++ b/data/config/nakazato-shen-z0.004-t_rev300ms-s13.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 13.0Msun progenitor with Shen equation of state, metallicity z=0.004 and shock revival time t_rev=300ms progenitor: mass: 13.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.004-t_rev300ms-s13.0.fits diff --git a/data/config/nakazato-shen-z0.004-t_rev300ms-s20.0.yaml b/data/config/nakazato-shen-z0.004-t_rev300ms-s20.0.yaml index 74f2e40..a129b1b 100644 --- a/data/config/nakazato-shen-z0.004-t_rev300ms-s20.0.yaml +++ b/data/config/nakazato-shen-z0.004-t_rev300ms-s20.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 20.0Msun progenitor with Shen equation of state, metallicity z=0.004 and shock revival time t_rev=300ms progenitor: mass: 20.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.004-t_rev300ms-s20.0.fits diff --git a/data/config/nakazato-shen-z0.004-t_rev300ms-s50.0.yaml b/data/config/nakazato-shen-z0.004-t_rev300ms-s50.0.yaml index 5df4056..3c5f29d 100644 --- a/data/config/nakazato-shen-z0.004-t_rev300ms-s50.0.yaml +++ b/data/config/nakazato-shen-z0.004-t_rev300ms-s50.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 50.0Msun progenitor with Shen equation of state, metallicity z=0.004 and shock revival time t_rev=300ms progenitor: mass: 50.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.004-t_rev300ms-s50.0.fits diff --git a/data/config/nakazato-shen-z0.02-t_rev100ms-s13.0.yaml b/data/config/nakazato-shen-z0.02-t_rev100ms-s13.0.yaml index ede54fe..edefe11 100644 --- a/data/config/nakazato-shen-z0.02-t_rev100ms-s13.0.yaml +++ b/data/config/nakazato-shen-z0.02-t_rev100ms-s13.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 13.0Msun progenitor with Shen equation of state, metallicity z=0.02 and shock revival time t_rev=100ms progenitor: mass: 13.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.02-t_rev100ms-s13.0.fits diff --git a/data/config/nakazato-shen-z0.02-t_rev100ms-s20.0.yaml b/data/config/nakazato-shen-z0.02-t_rev100ms-s20.0.yaml index ab4b6c7..098e85a 100644 --- a/data/config/nakazato-shen-z0.02-t_rev100ms-s20.0.yaml +++ b/data/config/nakazato-shen-z0.02-t_rev100ms-s20.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 20.0Msun progenitor with Shen equation of state, metallicity z=0.02 and shock revival time t_rev=100ms progenitor: mass: 20.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.02-t_rev100ms-s20.0.fits diff --git a/data/config/nakazato-shen-z0.02-t_rev100ms-s30.0.yaml b/data/config/nakazato-shen-z0.02-t_rev100ms-s30.0.yaml index 1916b7b..01579fe 100644 --- a/data/config/nakazato-shen-z0.02-t_rev100ms-s30.0.yaml +++ b/data/config/nakazato-shen-z0.02-t_rev100ms-s30.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 30.0Msun progenitor with Shen equation of state, metallicity z=0.02 and shock revival time t_rev=100ms progenitor: mass: 30.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.02-t_rev100ms-s30.0.fits diff --git a/data/config/nakazato-shen-z0.02-t_rev100ms-s50.0.yaml b/data/config/nakazato-shen-z0.02-t_rev100ms-s50.0.yaml index 6bb4c73..36dfc84 100644 --- a/data/config/nakazato-shen-z0.02-t_rev100ms-s50.0.yaml +++ b/data/config/nakazato-shen-z0.02-t_rev100ms-s50.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 50.0Msun progenitor with Shen equation of state, metallicity z=0.02 and shock revival time t_rev=100ms progenitor: mass: 50.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.02-t_rev100ms-s50.0.fits diff --git a/data/config/nakazato-shen-z0.02-t_rev200ms-s13.0.yaml b/data/config/nakazato-shen-z0.02-t_rev200ms-s13.0.yaml index 1826b54..b9547bc 100644 --- a/data/config/nakazato-shen-z0.02-t_rev200ms-s13.0.yaml +++ b/data/config/nakazato-shen-z0.02-t_rev200ms-s13.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 13.0Msun progenitor with Shen equation of state, metallicity z=0.02 and shock revival time t_rev=200ms progenitor: mass: 13.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.02-t_rev200ms-s13.0.fits diff --git a/data/config/nakazato-shen-z0.02-t_rev200ms-s20.0.yaml b/data/config/nakazato-shen-z0.02-t_rev200ms-s20.0.yaml index 0e56dd8..129ddbf 100644 --- a/data/config/nakazato-shen-z0.02-t_rev200ms-s20.0.yaml +++ b/data/config/nakazato-shen-z0.02-t_rev200ms-s20.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 20.0Msun progenitor with Shen equation of state, metallicity z=0.02 and shock revival time t_rev=200ms progenitor: mass: 20.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.02-t_rev200ms-s20.0.fits diff --git a/data/config/nakazato-shen-z0.02-t_rev200ms-s30.0.yaml b/data/config/nakazato-shen-z0.02-t_rev200ms-s30.0.yaml index f054ff7..fa8844a 100644 --- a/data/config/nakazato-shen-z0.02-t_rev200ms-s30.0.yaml +++ b/data/config/nakazato-shen-z0.02-t_rev200ms-s30.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 30.0Msun progenitor with Shen equation of state, metallicity z=0.02 and shock revival time t_rev=200ms progenitor: mass: 30.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.02-t_rev200ms-s30.0.fits diff --git a/data/config/nakazato-shen-z0.02-t_rev200ms-s50.0.yaml b/data/config/nakazato-shen-z0.02-t_rev200ms-s50.0.yaml index 8c3bc20..f04371c 100644 --- a/data/config/nakazato-shen-z0.02-t_rev200ms-s50.0.yaml +++ b/data/config/nakazato-shen-z0.02-t_rev200ms-s50.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 50.0Msun progenitor with Shen equation of state, metallicity z=0.02 and shock revival time t_rev=200ms progenitor: mass: 50.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.02-t_rev200ms-s50.0.fits diff --git a/data/config/nakazato-shen-z0.02-t_rev300ms-s13.0.yaml b/data/config/nakazato-shen-z0.02-t_rev300ms-s13.0.yaml index 3a4647d..4322e2a 100644 --- a/data/config/nakazato-shen-z0.02-t_rev300ms-s13.0.yaml +++ b/data/config/nakazato-shen-z0.02-t_rev300ms-s13.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 13.0Msun progenitor with Shen equation of state, metallicity z=0.02 and shock revival time t_rev=300ms progenitor: mass: 13.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.02-t_rev300ms-s13.0.fits diff --git a/data/config/nakazato-shen-z0.02-t_rev300ms-s20.0.yaml b/data/config/nakazato-shen-z0.02-t_rev300ms-s20.0.yaml index d0e2f57..c9db7bb 100644 --- a/data/config/nakazato-shen-z0.02-t_rev300ms-s20.0.yaml +++ b/data/config/nakazato-shen-z0.02-t_rev300ms-s20.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 20.0Msun progenitor with Shen equation of state, metallicity z=0.02 and shock revival time t_rev=300ms progenitor: mass: 20.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.02-t_rev300ms-s20.0.fits diff --git a/data/config/nakazato-shen-z0.02-t_rev300ms-s30.0.yaml b/data/config/nakazato-shen-z0.02-t_rev300ms-s30.0.yaml index af4541d..2f78466 100644 --- a/data/config/nakazato-shen-z0.02-t_rev300ms-s30.0.yaml +++ b/data/config/nakazato-shen-z0.02-t_rev300ms-s30.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 30.0Msun progenitor with Shen equation of state, metallicity z=0.02 and shock revival time t_rev=300ms progenitor: mass: 30.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.02-t_rev300ms-s30.0.fits diff --git a/data/config/nakazato-shen-z0.02-t_rev300ms-s50.0.yaml b/data/config/nakazato-shen-z0.02-t_rev300ms-s50.0.yaml index e3e9721..7d905b6 100644 --- a/data/config/nakazato-shen-z0.02-t_rev300ms-s50.0.yaml +++ b/data/config/nakazato-shen-z0.02-t_rev300ms-s50.0.yaml @@ -32,7 +32,11 @@ source: model: Nakazato 50.0Msun progenitor with Shen equation of state, metallicity z=0.02 and shock revival time t_rev=300ms progenitor: mass: 50.0 M_sun - distance : 10 kpc + # Distance model: can be FixedDistance or StellarDensity + distance: + model: FixedDistance + distance: 10 kpc + uncertainty: 0 kpc table: format: fits path: spectra/nakazato-shen-z0.02-t_rev300ms-s50.0.fits