Skip to content

add access to new dust3 parameter and xrb contribution. #203

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
bd-j merged 2 commits into from
Apr 28, 2023
Merged

add access to new dust3 parameter and xrb contribution. #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e606000
add access to new dust3 parameter and xrb contribution.
bd-j Apr 27, 2023
434e482
add test for dust3.
bd-j Apr 28, 2023
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
13 changes: 8 additions & 5 deletions src/fsps/fsps.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,19 @@ subroutine set_ssp_params(imf_type0,imf_upper_limit0,imf_lower_limit0,&
delt,sbss,fbhb,pagb,add_stellar_remnants0,&
tpagb_norm_type0,add_agb_dust_model0,agb_dust,&
redgb,agb,masscut,fcstar,evtype,use_wr_spectra0,&
logt_wmb_hot0,smooth_lsf0)
logt_wmb_hot0,add_xrb_emission0,frac_xrb,smooth_lsf0)

! Set the parameters that affect the SSP computation.

implicit none

integer, intent(in) :: imf_type0,add_stellar_remnants0,tpagb_norm_type0,&
add_agb_dust_model0,use_wr_spectra0,smooth_lsf0
add_agb_dust_model0,use_wr_spectra0,add_xrb_emission0,smooth_lsf0
double precision, intent(in) :: imf_upper_limit0, imf_lower_limit0,&
imf1,imf2,imf3,vdmc,mdave,dell,&
delt,sbss,fbhb,pagb,agb_dust,&
redgb,agb,masscut,fcstar,evtype,&
logt_wmb_hot0
logt_wmb_hot0,frac_xrb

imf_type=imf_type0
imf_upper_limit=imf_upper_limit0
Expand All @@ -69,6 +69,7 @@ subroutine set_ssp_params(imf_type0,imf_upper_limit0,imf_lower_limit0,&
use_wr_spectra=use_wr_spectra0
logt_wmb_hot=logt_wmb_hot0
smooth_lsf=smooth_lsf0
add_xrb_emission=add_xrb_emission0
pset%imf1=imf1
pset%imf2=imf2
pset%imf3=imf3
Expand All @@ -85,6 +86,7 @@ subroutine set_ssp_params(imf_type0,imf_upper_limit0,imf_lower_limit0,&
pset%masscut=masscut
pset%fcstar=fcstar
pset%evtype=evtype
pset%frac_xrb=frac_xrb

has_ssp(:) = 0
has_ssp_age(:,:) = 0
Expand All @@ -96,7 +98,7 @@ subroutine set_csp_params(smooth_velocity0,redshift_colors0,&
dust_type0,add_dust_emission0,add_neb_emission0,&
add_neb_continuum0,cloudy_dust0,add_igm_absorption0,&
zmet,sfh,wgp1,wgp2,wgp3,tau,&
const,tage,fburst,tburst,dust1,dust2,&
const,tage,fburst,tburst,dust1,dust2,dust3,&
logzsol,zred,pmetals,dust_clumps,frac_nodust,&
dust_index,dust_tesc,frac_obrun,uvb,mwr,&
dust1_index,sf_start,sf_trunc,sf_slope,&
Expand All @@ -114,7 +116,7 @@ subroutine set_csp_params(smooth_velocity0,redshift_colors0,&
add_neb_continuum0,cloudy_dust0,add_igm_absorption0,&
zmet,sfh,wgp1,wgp2,wgp3
double precision, intent(in) :: tau,&
const,tage,fburst,tburst,dust1,dust2,&
const,tage,fburst,tburst,dust1,dust2,dust3,&
logzsol,zred,pmetals,dust_clumps,frac_nodust,&
dust_index,dust_tesc,frac_obrun,uvb,mwr,&
dust1_index,sf_start,sf_trunc,sf_slope,&
Expand Down Expand Up @@ -146,6 +148,7 @@ subroutine set_csp_params(smooth_velocity0,redshift_colors0,&
pset%tburst=tburst
pset%dust1=dust1
pset%dust2=dust2
pset%dust3=dust3
pset%logzsol=logzsol
pset%zred=zred
pset%pmetals=pmetals
Expand Down
17 changes: 17 additions & 0 deletions src/fsps/fsps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ class StellarPopulation(object):
stars; a value of 1.0 implies that the Vassiliadis & Wood (1994) tracks
are implemented as–is.

:param frac_xrb: (default: 1.0)
Scaling factor for the X-ray source spectrum to be added to the SSPs.

:param zred: (default: 0.0)
Redshift. If this value is non-zero and if ``redshift_colors=1``, the
magnitudes will be computed for the spectrum placed at redshift
Expand Down Expand Up @@ -237,6 +240,9 @@ class StellarPopulation(object):
Use the Eldridge (2017) WMBasic hot star library above this value of
:math:`\log T_\mathrm{eff}` or 25,000K, whichever is larger.

:param add_xrb_emission: (default: 0)
Turn on/off the x-ray binary population spectra from Garofali et al.

:param masscut: (default: 150.0)
Truncate the IMF above this value.

Expand Down Expand Up @@ -350,6 +356,11 @@ class StellarPopulation(object):
Dust parameter describing the attenuation of old stellar light,
i.e. where ``t > dust_tesc`` (for details, see Conroy et al. 2009a).

:param dust3: (default: 0.0)
Dust parameter describing extra attenuation of old stellar light that
does _not_ afect the young (``t < dust_tesc`` ) star light. The
attenuation curve will be the one specified by ``dust_type``

:param dust_clumps: (default: -99.)
Dust parameter describing the dispersion of a Gaussian PDF density
distribution for the old dust. Setting this value to -99.0 sets the
Expand Down Expand Up @@ -460,6 +471,7 @@ def __init__(
fbhb=0.0,
sbss=0.0,
pagb=1.0,
frac_xrb=1.0,
zred=0.0,
zmet=1,
logzsol=0.0,
Expand All @@ -475,6 +487,7 @@ def __init__(
evtype=-1,
use_wr_spectra=1,
logt_wmb_hot=0.0,
add_xrb_emission=0,
masscut=150.0,
sigma_smooth=0.0,
min_wave_smooth=1e3,
Expand All @@ -495,6 +508,7 @@ def __init__(
dust_type=0,
dust1=0.0,
dust2=0.0,
dust3=0.0,
dust_clumps=-99.0,
frac_nodust=0.0,
frac_obrun=0.0,
Expand Down Expand Up @@ -1256,6 +1270,8 @@ class ParameterSet(object):
"evtype",
"use_wr_spectra",
"logt_wmb_hot",
"add_xrb_emission",
"frac_xrb",
"smooth_lsf",
]

Expand All @@ -1282,6 +1298,7 @@ class ParameterSet(object):
"tburst",
"dust1",
"dust2",
"dust3",
"logzsol",
"zred",
"pmetals",
Expand Down
29 changes: 29 additions & 0 deletions tests/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,35 @@ def test_redshift(pop_and_params):
assert np.all(v5 != v4)


def test_dust3(pop_and_params):
"""Make sure nebular lines are actually added."""

# uses default SSPs

pop, params = pop_and_params
_reset_default_params(pop, params)
pop.params["sfh"] = 4
pop.params["dust_type"] = 4
pop.params["tau"] = 5.0
pop.params["dust1"] = 0
pop.params["dust2"] = 0.5

# make sure dust3 affects the population when there are old stars
pop.params["dust3"] = 0.0
mag1 = pop.get_mags(tage=1.0, bands=["u", "b"])
pop.params["dust3"] = 1.0
mag2 = pop.get_mags(tage=1.0, bands=["u", "b"])
assert np.all(mag2 > mag1)

# make sure the dust3 isn't affecting young populations
pop.params["dust_tesc"] = 8
pop.params["dust3"] = 0.0
mag3 = pop.get_mags(tage=0.05, bands=["u", "b"])
pop.params["dust3"] = 1.0
mag4 = pop.get_mags(tage=0.05, bands=["u", "b"])
assert_allclose(mag3, mag4)


def test_nebemlineinspec(pop_and_params):
"""Make sure nebular lines are actually added."""

Expand Down