Skip to content

Stellar #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sybenzvi merged 8 commits into from
May 27, 2019
Merged

Stellar #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
84b90a9
Enable model conversion to str.
May 25, 2019
bb6c337
Fix typo in pydocs.
May 26, 2019
c3fc55f
Use distance models from stellardist module.
May 26, 2019
be6dcc3
Change test to default.yaml; use stellardist.
May 26, 2019
9f1a8db
Change default.yaml back to test.yaml.
May 26, 2019
e6d1b3b
Correct format error in test.yaml.
May 27, 2019
2baf0c8
Change names of yaml variables.
May 27, 2019
aa2d9f8
Use updated distance model.
May 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion data/config/nakazato-LS220-BH-z0.004-s30.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-BH-z0.004-s30.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.004-t_rev100ms-s13.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.004-t_rev100ms-s20.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.004-t_rev100ms-s50.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.004-t_rev200ms-s13.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.004-t_rev200ms-s20.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.004-t_rev200ms-s50.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.004-t_rev300ms-s13.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.004-t_rev300ms-s20.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.004-t_rev300ms-s50.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.02-t_rev100ms-s13.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.02-t_rev100ms-s20.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.02-t_rev100ms-s30.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.02-t_rev100ms-s50.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.02-t_rev200ms-s13.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.02-t_rev200ms-s20.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.02-t_rev200ms-s30.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.02-t_rev200ms-s50.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.02-t_rev300ms-s13.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.02-t_rev300ms-s20.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.02-t_rev300ms-s30.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion data/config/nakazato-shen-z0.02-t_rev300ms-s50.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 10 additions & 1 deletion data/config/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,16 @@ 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
# path: stellar/sn_radial_distrib_adams.fits
# add_LMC: False
# add_SMC: False
table:
format: fits
path: spectra/sukhbold-SFHo-z9.6.fits
Expand Down
Loading