Merge pull request #159 from bd-j/dustelib

dust emission libraries

Author: bd-j

demos/feature_demo.py

@@ -34,6 +34,7 @@ def prettify(fig, ax, label=None):
     if label is not None:
         ax.text(0.63, 0.85, label, transform=ax.transAxes, fontsize=16)
 
+    fig.tight_layout()
     return fig, ax
 
 
@@ -48,6 +49,8 @@ def prettify(fig, ax, label=None):
     pl.rc('ytick', right=True)
 
     sps = fsps.StellarPopulation(zcontinuous=1)
+    ilib, slib, dlib = sps.libraries
+    print(ilib, slib)
     os.makedirs("./figures", exist_ok=True)
     pdf = PdfPages('./figures/features.pdf')
 
@@ -59,7 +62,7 @@ def prettify(fig, ax, label=None):
     sps.params['imf_type'] = 2  # kroupa
     sps.params['imf3'] = 2.3
     fig, ax, spec = makefig(sps)
-    fig, ax = prettify(fig, ax, label=r"$\tau=5$, Age$=13.7$,\n$\log Z/Z_\odot=0.0$")
+    fig, ax = prettify(fig, ax, label=r"$\tau=5$, Age$=13.7$,\\n$\log Z/Z_\odot=0.0$")
     pdf.savefig(fig)
     pl.close(fig)
 
@@ -87,22 +90,22 @@ def prettify(fig, ax, label=None):
     # Dust temperature
     sps.params['duste_umin'] = 10
     fig, ax, spec = makefig(sps, oldspec=spec)
-    fig, ax = prettify(fig, ax, label=r"Dust SED\n(Draine)")
+    fig, ax = prettify(fig, ax, label=r"Dust SED\\n({})".format(dlib))
     pdf.savefig(fig)
     pl.close(fig)
 
     # AGN emission
     sps.params['fagn'] = 0.3
     fig, ax, spec = makefig(sps, oldspec=spec)
-    fig, ax = prettify(fig, ax, label=r"AGN dust\n(Nenkova)")
+    fig, ax = prettify(fig, ax, label=r"AGN dust\\n(Nenkova)")
     pdf.savefig(fig)
     pl.close(fig)
 
     # Nebular emission
     sps.params['add_neb_emission'] = True
     sps.params['gas_logu'] = -3.5
     fig, ax, spec = makefig(sps, oldspec=spec)
-    fig, ax = prettify(fig, ax, label=r"Neb. emission\n(Byler)")
+    fig, ax = prettify(fig, ax, label=r"Neb. emission\\n(Byler)")
     pdf.savefig(fig)
     pl.close(fig)
 
@@ -125,7 +128,7 @@ def prettify(fig, ax, label=None):
     sps.params['zred'] = 6.0
     sps.params['add_igm_absorption'] = True
     fig, ax, spec = makefig(sps, oldspec=spec)
-    fig, ax = prettify(fig, ax, label=r"IGM attenuation\n(Madau, $z=6$)")
+    fig, ax = prettify(fig, ax, label=r"IGM attenuation\\n(Madau, $z=6$)")
     pdf.savefig(fig)
     pl.close(fig)
 

docs/installation.rst

@@ -19,9 +19,9 @@ Where, on different systems, you might have to specify the `SPS_HOME`
 environment variable. Python-FSPS requires that variable to be set and it will
 fail to import if it is set incorrectly.
 
-Python-FSPS is built against specific versions of the FSPS Fortran API, so it is
-important that you have a recent version of FSPS through git. Currently
-Python-FSPS is built against FSPS v3.0.
+Python-FSPS is built against specific versions of the FSPS Fortran API and data
+files, so it is important that you have a recent version of FSPS through git.
+Currently Python-FSPS is built against FSPS v3.2.
 
 Installing stable version
 -------------------------
@@ -55,7 +55,15 @@ in more detail in the FSPS documentation, but their names are:
    - `MILES` (default)
    - `BASEL`
 
-Changing either library requires switching off the relevant default, which for isochrones is `MIST` and for spectra is `MILES`, and switching on the desired library. As an example, you can change to Padova isochrones and the BaSeL low resolution synthetic stellar library by re-installing:
+* Dust emission libraries
+
+   - `DL07` (default)
+   - `THEMIS`
+
+Changing any of these libraries requires switching off the relevant default,
+which for isochrones is `MIST` and for spectra is `MILES`, and switching on the
+desired library. As an example, you can change to Padova isochrones and the
+BaSeL low resolution synthetic stellar library by re-installing:
 
 .. code-block:: bash
 
@@ -77,9 +85,10 @@ repository <https://github.com/dfm/python-fsps>`_ and building:
     cd python-fsps
     python -m pip install .
 
-Flags can be prepended to change the stellar libraries as described above. This repository includes FSPS as a submodule, so if you forget the `--recursive`
-flag above, you can get the submodule by running the following commands in the
-root directory of the Python-FSPS repository:
+Flags can be prepended to change the stellar libraries as described above. This
+repository includes FSPS as a submodule, so if you forget the `--recursive` flag
+above, you can get the submodule by running the following commands in the root
+directory of the Python-FSPS repository:
 
 .. code-block:: bash
 

docs/stellarpop_api.rst

@@ -15,7 +15,7 @@ and some dust with a Calzetti et al (2000) extinction curve::
    >>> sp = fsps.StellarPopulation(compute_vega_mags=False, zcontinuous=1,
                                    sfh=0, logzsol=0.0, dust_type=2, dust2=0.2)
    >>> sp.libraries
-   ('mist', 'miles')
+   ('mist', 'miles', 'DL07')
 
 The last line indicates that we are using the MIST isochrones and MILES spectral
 library. These can be changed only by reinstalling python-FSPS with appropriate

src/fsps/fsps.f90

@@ -514,14 +514,16 @@ subroutine get_lambda(ns,lambda)
 
   end subroutine
 
-  subroutine get_libraries(isocname,specname)
+  subroutine get_libraries(isocname,specname,dustname)
 
     implicit none
 
     character(4), intent(out) :: isocname
     character(5), intent(out) :: specname
+    character(6), intent(out) :: dustname
     isocname = isoc_type
     specname = spec_type
+    dustname = str_dustem
 
   end subroutine
 

src/fsps/fsps.py

@@ -1159,14 +1159,20 @@ def sfr_avg(self, times=None, dt=0.1):
 
     @property
     def isoc_library(self):
-        r"""The name of the isochrone library being used in FSPS."""
+        r"""The name of the stellar isochrone library being used in FSPS."""
         return self.libraries[0]
 
     @property
     def spec_library(self):
-        r"""The name of the spectral library being used in FSPS."""
+        r"""The name of the stellar spectral library being used in FSPS."""
         return self.libraries[1]
 
+    @property
+    def duste_library(self):
+        r"""The name of the dust emission SED library being used in FSPS."""
+        return self.libraries[2]
+
+
     @property
     def libraries(self):
         if self._libraries is None:

tests/tests.py

@@ -55,9 +55,10 @@ def test_libraries(pop_and_params):
     """This does not require or build clean SSPs"""
     pop, params = pop_and_params
     _reset_default_params(pop, params)
-    ilib, splib = pop.libraries
+    ilib, splib, dlib = pop.libraries
     assert ilib == pop.isoc_library
     assert splib == pop.spec_library
+    assert dlib == pop.duste_library
 
 
 def test_filters():