Repository: sdss/mangadap (language: python)

Issue:
MPL-11 documentation updates & CI testing
As titled.


Discussion / hints:

Fix patch:
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index d01910c1..403992e2 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.1.0
+current_version = 3.1.1dev
 commit = False
 tag = False
 tag_name = {new_version}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index affc4efc..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-filter_secrets: false
-
-language: python
-
-cache:
-  pip: true
-  timeout: 1000
-
-python:
-    - '3.7'
-    - '3.8'
-
-os:
-    - linux
-
-env:
-  global:
-  matrix:
-
-matrix:
-  fast_finish: true
-
-notifications:
-  email: false
-
-branches:
-    - master
-
-before_install:
-    - wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O ~/miniconda.sh
-    - bash ~/miniconda.sh -b -p $HOME/miniconda
-    - export PATH="$HOME/miniconda/bin:$PATH"
-    - conda update --yes conda
-
-install:
-    - conda create --yes -n test_env python=$TRAVIS_PYTHON_VERSION pip numpy scipy matplotlib --quiet
-    - source activate test_env
-    - pip install -U pip wheel --quiet
-    - pip install --upgrade setuptools --quiet
-    - pip install -r requirements_dev.txt --quiet
-    - python setup.py install
-
-script:
-    - pytest mangadap/tests --cov mangadap --cov-report html
-
-after_success:
-    - coveralls
-
diff --git a/CHANGES.md b/CHANGES.md
index dbe65689..97e0e9a8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,10 @@
 
+3.1.1dev
+--------
+
+ - Updated documentation for MPL-11 release.
+
+
 3.1.0 (23 Dec 2020)
 -------------------
 
diff --git a/docs/conf.py b/docs/conf.py
index 96b04d69..45b369a6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -67,9 +67,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.0'
+version = '3.1.1dev'
 # The full version, including alpha/beta/rc tags.
-release = '3.1.0'
+release = '3.1.1dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/datamodel.rst b/docs/datamodel.rst
index f7f734ff..c77a9aa0 100644
--- a/docs/datamodel.rst
+++ b/docs/datamodel.rst
@@ -30,13 +30,14 @@ construction of the ``DAPTYPE`` has changed since DR15.
 
 The table below provides relevant ``DAPTYPE`` keywords:
 
-+---------+-------------------------------------------------------------------------------------+
-| Release | ``DAPTYPE``                                                                         |
-+=========+=====================================================================================+
-| DR-15   | ``VOR10-GAU-MILESHC``, ``HYB10-GAU-MILESHC``                                        |
-+---------+-------------------------------------------------------------------------------------+
-| MPL-10  | ``SPX-MILESHC-MASTARHC2``, ``VOR10-MILESHC-MASTARHC2``, ``HYB10-MILESHC-MASTARHC2`` |
-+---------+-------------------------------------------------------------------------------------+
++---------+-----------------------------------------------------------------+
+| Release | ``DAPTYPE``                                                     |
++=========+=================================================================+
+| DR-15   | ``VOR10-GAU-MILESHC``, ``HYB10-GAU-MILESHC``                    |
++---------+-----------------------------------------------------------------+
+| MPL-11  | ``SPX-MILESHC-MASTARSSP``, ``VOR10-MILESHC-MASTARSSP``,         |
+|         | ``HYB10-MILESHC-MASTARSSP``, ``HYB10-MILESHC-MASTARHC2``        |
++---------+-----------------------------------------------------------------+
 
 .. _datamodel-directory-structure:
 
@@ -62,19 +63,22 @@ The top level within a given DAP version contains the following subdirectories:
    multiple ``DAPTYPE`` methods.
 
 Most users will only interact with the ``[DAPTYPE]`` directories.  For
-the MPL-10, these are:
+the MPL-11, these are:
 
- * ``SPX-MILESHC-MASTARHC2/``: Analysis of each individual spaxel;
+ * ``SPX-MILESHC-MASTARSSP/``: Analysis of each individual spaxel;
    spaxels must have a valid continuum fit for an emission-line model to
    be fit.
- * ``VOR10-MILESHC-MASTARHC2/``: Analysis of spectra binned to
+ * ``VOR10-MILESHC-MASTARSSP/``: Analysis of spectra binned to
    :math:`{\rm S/N}\sim 10` using the Voronoi binning algorithm
    (Cappellari & Copin 2003).
- * ``HYB10-MILESHC-MASTARHC2/``: Stellar-continuum analysis of spectra
+ * ``HYB10-MILESHC-MASTARSSP/``: Stellar-continuum analysis of spectra
    binned to :math:`{\rm S/N}\sim 10` for the stellar kinematics (same
    as ``VOR10`` approach); however, the emission-line measurements are
    performed on the individual spaxels.  See a description of the
    :ref:`datamodel-hybrid-binning`.
+ * ``HYB10-MILESHC-MASTARHC2/``: Same as the above except the hierarchically
+   clustered MaStar stellar spectra are used to fit the stellar continuum in
+   the emission-line module.
 
 See the advice for :ref:`gettingstarted-daptype` appropriate for your
 science.
@@ -261,10 +265,11 @@ The ``MAPS`` files contain the following extensions:
 +-----+---------------------+----------+------------------------------------------------------+--------------------------------------------------------------------+
 |  20 | STELLAR_SIGMA_MASK  |        1 |                                                      | Data quality mask for stellar velocity dispersion.                 |
 +-----+---------------------+----------+------------------------------------------------------+--------------------------------------------------------------------+
-|  21 | STELLAR_SIGMACORR   |        1 |                                                 km/s | Quadrature correction for STELLAR_SIGMA to obtain the              |
+|  21 | STELLAR_SIGMACORR   |        2 |                                                 km/s | Quadrature correction for STELLAR_SIGMA to obtain the              |
 |     |                     |          |                                                      | astrophysical velocity dispersion; see :ref:`corrections` for how  |
 |     |                     |          |                                                      | to use this extension with the ``STELLAR_SIGMA`` extension to      |
 |     |                     |          |                                                      | obtain the *astrophysical* stellar velocity dispersion.            |
+|     |                     |          |                                                      | **Use the first extension.**                                       |
 +-----+---------------------+----------+------------------------------------------------------+--------------------------------------------------------------------+
 |  22 | STELLAR_FOM         |        9 |                                                      | Figures-of-merit for the stellar-continuum fit in 9 channels: (1)  |
 |     |                     |          |                                                      | RMS of residuals (in                                               |
@@ -384,39 +389,39 @@ The ``MAPS`` files contain the following extensions:
 |  53 | SPECINDEX_MODEL     |       46 |                                           |ang|, mag | Spectral-index measurements for the best-fitting model spectrum.   |
 |     |                     |          |                                                      | Note the extension number is different from MPL-9.                 |
 +-----+---------------------+----------+------------------------------------------------------+--------------------------------------------------------------------+
-|  54 | SPECINDEX_BF        |       46 |                                           |ang|, mag | **New in MPL-10**.  Spectral-index measurements calculated using a |
+|  54 | SPECINDEX_BF        |       46 |                                           |ang|, mag | Spectral-index measurements calculated using a                     |
 |     |                     |          |                                                      | definition similar to Burstein et al. (1984) and                   |
 |     |                     |          |                                                      | Faber et al. (1985).  See :ref:`spectralindices`.                  |
 +-----+---------------------+----------+------------------------------------------------------+--------------------------------------------------------------------+
-|  55 | SPECINDEX_BF_IVAR   |       46 |                                                      | **New in MPL-10**.  Inverse variance in the BF spectral indices.   |
+|  55 | SPECINDEX_BF_IVAR   |       46 |                                                      | Inverse variance in the BF spectral indices.                       |
 +-----+---------------------+----------+------------------------------------------------------+--------------------------------------------------------------------+
-|  56 | SPECINDEX_BF_MASK   |       46 |                                                      | **New in MPL-10**.  Data quality mask for the BF spectral indices. |
+|  56 | SPECINDEX_BF_MASK   |       46 |                                                      | Data quality mask for the BF spectral indices.                     |
 +-----+---------------------+----------+------------------------------------------------------+--------------------------------------------------------------------+
-|  57 | SPECINDEX_BF_CORR   |       46 |                                                  mag | **New in MPL-10**.  Corrections to apply to account for the        |
+|  57 | SPECINDEX_BF_CORR   |       46 |                                                  mag | Corrections to apply to account for the                            |
 |     |                     |          |                                                      | velocity dispersion and effectively determine the index without    |
 |     |                     |          |                                                      | Doppler broadening; see :ref:`corrections`.                        | 
 +-----+---------------------+----------+------------------------------------------------------+--------------------------------------------------------------------+
-|  58 | SPECINDEX_BF_MODEL  |       46 |                                           |ang|, mag | **New in MPL-10**.  Spectral indices with the BF definition        |
+|  58 | SPECINDEX_BF_MODEL  |       46 |                                           |ang|, mag | Spectral indices with the BF definition                            |
 |     |                     |          |                                                      | measured using the best-fitting model spectrum.                    |
 +-----+---------------------+----------+------------------------------------------------------+--------------------------------------------------------------------+
-|  59 | SPECINDEX_WGT       |       46 |       :math:`10^{-17} {\rm erg/s/cm}^2`/|ang|/spaxel | **New in MPL-10**.  Weights to use when aggregating spectral-index |
+|  59 | SPECINDEX_WGT       |       46 |       :math:`10^{-17} {\rm erg/s/cm}^2`/|ang|/spaxel | Weights to use when aggregating spectral-index                     |
 |     |                     |          |                                                      | measurements.  See :ref:`spectralindices` and :ref:`aggregation`.  |
 +-----+---------------------+----------+------------------------------------------------------+--------------------------------------------------------------------+
-|  60 | SPECINDEX_WGT_IVAR  |       46 |                                                      | **New in MPL-10**. Inverse variance in the spectral index weights. |
+|  60 | SPECINDEX_WGT_IVAR  |       46 |                                                      | nverse variance in the spectral index weights.                     |
 +-----+---------------------+----------+------------------------------------------------------+--------------------------------------------------------------------+
-|  61 | SPECINDEX_WGT_MASK  |       46 |                                                      | **New in MPL-10**.  Data quality mask for spectral index weights.  |
+|  61 | SPECINDEX_WGT_MASK  |       46 |                                                      | Data quality mask for spectral index weights.                      |
 +-----+---------------------+----------+------------------------------------------------------+--------------------------------------------------------------------+
-|  62 | SPECINDEX_WGT_CORR  |       46 |                                                      | **New in MPL-10**.  Corrections to apply to account for the        |
+|  62 | SPECINDEX_WGT_CORR  |       46 |                                                      | Corrections to apply to account for the                            |
 |     |                     |          |                                                      | effect of the velocity dispersion on the calculation of the index  |
 |     |                     |          |                                                      | weight; see :ref:`corrections`.                                    | 
 +-----+---------------------+----------+------------------------------------------------------+--------------------------------------------------------------------+
-|  63 | SPECINDEX_WGT_MODEL |       46 |       :math:`10^{-17} {\rm erg/s/cm}^2`/|ang|/spaxel | **New in MPL-10**.  Spectral-index weights determined by the       |
+|  63 | SPECINDEX_WGT_MODEL |       46 |       :math:`10^{-17} {\rm erg/s/cm}^2`/|ang|/spaxel | Spectral-index weights determined by the                           |
 |     |                     |          |                                                      | best-fitting models.                                               |
 +-----+---------------------+----------+------------------------------------------------------+--------------------------------------------------------------------+
 
 .. _datamodel-emission-line-channels:
 
-The emission-line measurements for MPL-10 are (identical to MPL-9):
+The emission-line measurements for MPL-11 are (identical to MPL-10):
 
 .. code-block:: fortran
 
@@ -479,8 +484,8 @@ The emission-line measurements for MPL-10 are (identical to MPL-9):
 
 .. _datamodel-spectral-index-channels:
 
-The spectral-index measurements for MPL-10 are below (identical to
-MPL-9). Because the spectral-index measurements can be either
+The spectral-index measurements for MPL-11 are below (identical to
+MPL-10). Because the spectral-index measurements can be either
 angstroms, magnitudes, or unitless, the header of the spectral-index
 extensions also include the units using header keywords ``U[n]``. The
 indices and relevant units as included in the relevant extension
@@ -646,8 +651,8 @@ The ``LOGCUBE`` files contain the following extensions:
 |   3 |               MASK |                                                      | Bitmask for the binned spectra.  Note that this mask only applies to  |
 |     |                    |                                                      | the binned spectra.                                                   |
 +-----+--------------------+------------------------------------------------------+-----------------------------------------------------------------------+
-|   4 |                LSF |                                                |ang| | **New in MPL-10**: The dispersion (:math:`\sigma`) of the Gaussian    |
-|     |                    |                                                      | line-spread function of the binned spectra.  For MPL-10, the source   |
+|   4 |                LSF |                                                |ang| | The dispersion (:math:`\sigma`) of the Gaussian                       |
+|     |                    |                                                      | line-spread function of the binned spectra.  For MPL-11, the source   |
 |     |                    |                                                      | DRP extension is ``LSFPRE``.                                          |
 +-----+--------------------+------------------------------------------------------+-----------------------------------------------------------------------+
 |   5 |               WAVE |                                                |ang| | Vacuum-wavelength vector                                              |
@@ -784,8 +789,8 @@ in mind:
    the emission-line model is first subtracted from the data before the
    index measurements.
 
-Usage Guidlines: Stellar velocity dispersions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Usage Guidelines: Stellar velocity dispersions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Measurement of stellar (and gas!) velocity dispersions in MaNGA is
 complicated by the spectral resolution, particularly at low S/N and
@@ -816,8 +821,8 @@ guidelines to consider when handling the velocity dispersion data:
 
 .. _datamodel-eml-tpl-resolution:
 
-Usage Guidlines: Emission-line template resolution
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Usage Guidelines: Emission-line template resolution
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 When using the recommended emission-line module
 (:class:`~mangadap.proc.sasuke.Sasuke`), the emission lines are fit
diff --git a/docs/emissionlines.rst b/docs/emissionlines.rst
index a112b9fe..bfd69ea4 100644
--- a/docs/emissionlines.rst
+++ b/docs/emissionlines.rst
@@ -38,179 +38,201 @@ calculations of the line equivalent width (EW), including the main
 passband centered on the line and blue and red sidebands that are used
 to construct a linear continuum beneath the emission line.
 
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| Name                    |  Rest :math:`\lambda` (|ang|) |      M1 |      E2 | EW Passband (|ang|) |  Blue Passband (|ang|) | Red Passband (|ang|) |
-+=========================+===============================+=========+=========+=====================+========================+======================+
-| HeII                    |                     3204.038  |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| NeV                     |                     3346.783  |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| NeV                     |                     3426.863  |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| H25                     |                     3670.5154 |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| H24                     |                     3672.5279 |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| H23                     |                     3674.8109 |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| H22                     |                     3677.4160 |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| H21                     |                     3680.4065 |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| H20                     |                     3683.8627 |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| H19                     |                     3687.8870 |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| H18                     |                     3692.6119 |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| H17                     |                     3698.2104 |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| H16                     |                     3704.9133 |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| H15                     |                     3713.0334 |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| H14                     |                     3723.0035 |         |         |                [1]_ |       3706.3 -- 3716.3 |     3738.6 -- 3748.6 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| OII                     |                     3727.092  |         |         |    3716.3 -- 3738.3 |       3706.3 -- 3716.3 |     3738.6 -- 3748.6 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| OII                     |                     3729.875  |         |         |                [1]_ |       3706.3 -- 3716.3 |     3738.6 -- 3748.6 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| H13                     |                     3735.4365 |         |         |                [1]_ |       3706.3 -- 3716.3 |     3738.6 -- 3748.6 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| H12                     |                     3751.2243 |         |         |    3746.2 -- 3756.2 |       3738.6 -- 3748.6 |     3756.6 -- 3766.6 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| H11                     |                     3771.7080 |         |         |    3761.7 -- 3781.7 |       3756.6 -- 3766.6 |     3779.1 -- 3789.1 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| :math:`{\rm H}\theta`   |                     3798.9826 |         |         |    3789.0 -- 3809.0 |       3776.5 -- 3791.5 |     3806.5 -- 3821.5 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| :math:`{\rm H}\eta`     |                     3836.4790 |         |         |    3826.5 -- 3846.5 |       3806.5 -- 3826.5 |     3900.2 -- 3920.2 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| NeIII                   |                     3869.86   | 1.74e-1 |         |    3859.9 -- 3879.9 |       3806.5 -- 3826.5 |     3900.2 -- 3920.2 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| HeI                     |                     3889.749  |         |         |                [1]_ |       3806.5 -- 3826.5 |     3900.2 -- 3920.2 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| :math:`{\rm H}\zeta`    |                     3890.1576 |         |         |    3880.2 -- 3900.2 |       3806.5 -- 3826.5 |     3900.2 -- 3920.2 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| NeIII                   |                     3968.59   | 5.40e-2 |         |                [1]_ |       3938.6 -- 3958.6 |     3978.6 -- 3998.6 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| :math:`{\rm H}\epsilon` |                     3971.2020 |         |         |    3961.2 -- 3981.2 |       3941.2 -- 3961.2 |     3981.2 -- 4001.2 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| HeI                     |                     4027.3238 |         |         |    4017.3 -- 4037.3 |       3997.3 -- 4017.3 |     4037.3 -- 4057.3 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| SII                     |                     4069.749  |         |         |    4062.7 -- 4073.6 |       4049.7 -- 4062.7 |     4082.0 -- 4092.9 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| SII                     |                     4077.500  |         |         |    4073.6 -- 4084.5 |       4049.7 -- 4062.7 |     4082.0 -- 4092.9 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| :math:`{\rm H}\delta`   |                     4102.8991 |         |         |    4092.9 -- 4112.9 |       4082.0 -- 4092.9 |     4112.9 -- 4132.9 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| :math:`{\rm H}\gamma`   |                     4341.691  |         |         |    4331.7 -- 4351.7 |       4311.7 -- 4331.7 |     4349.7 -- 4358.7 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| OIII                    |                     4364.435  |         |         |    4358.7 -- 4374.4 |       4349.7 -- 4358.7 |     4374.4 -- 4384.4 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| HeI                     |                     4472.729  |         |         |    4462.7 -- 4482.7 |       4442.7 -- 4462.7 |     4482.7 -- 4502.7 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| HeII                    |                     4687.015  |         |         |    4677.0 -- 4697.0 |       4667.0 -- 4677.0 |     4697.0 -- 4707.0 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| ArIV                    |                     4712.58   |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| HeI                     |                     4714.4578 |         |         |    4707.0 -- 4722.0 |       4697.0 -- 4707.0 |     4722.0 -- 4732.0 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| ArIV                    |                     4741.45   |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| :math:`{\rm H}\beta`    |                     4862.691  |         |         |    4852.7 -- 4872.7 |       4798.9 -- 4838.9 |     4885.6 -- 4925.6 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| HeI                     |                     4923.3051 |         |         |    4913.3 -- 4933.3 |       4898.3 -- 4913.3 |     4933.3 -- 4948.3 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| OIII                    |                     4960.295  | 6.21e-3 | 4.57e-6 |    4950.3 -- 4970.3 |       4930.3 -- 4950.3 |     4970.3 -- 4990.3 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| OIII                    |                     5008.240  | 1.81e-2 | 3.52e-5 |    4998.2 -- 5018.2 |       4978.2 -- 4998.2 |     5028.2 -- 5048.2 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| HeI                     |                     5017.0769 |         |         |                [1]_ |       4988.2 -- 4983.2 |     5028.2 -- 5048.2 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| NI                      |                     5199.3490 |         |         |    5189.3 -- 5209.3 |       5169.4 -- 5189.3 |     5211.7 -- 5231.7 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| NI                      |                     5201.7055 |         |         |                [1]_ |       5169.4 -- 5189.4 |     5211.7 -- 5231.7 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| NII                     |                     5756.19   |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| HeI                     |                     5877.243  |         |         |    5867.2 -- 5887.2 |       5847.2 -- 5867.2 |     5887.2 -- 5907.2 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| NaI                     |                     5891.583  |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| NaI                     |                     5897.558  |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| OI                      |                     6302.046  | 5.63e-3 | 2.11e-5 |    6292.0 -- 6312.0 |       6272.0 -- 6292.0 |     6312.0 -- 6332.0 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| OI                      |                     6365.535  | 1.82e-3 | 3.39e-6 |    6355.5 -- 6375.5 |       6335.5 -- 6355.5 |     6375.5 -- 6395.5 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| NII                     |                     6549.86   | 9.84e-4 | 9.22e-7 |    6542.9 -- 6556.9 |       6483.0 -- 6513.0 |     6623.0 -- 6653.0 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| :math:`{\rm H}\alpha`   |                     6564.632  |         |         |    6557.6 -- 6571.6 |       6483.0 -- 6513.0 |     6623.0 -- 6653.0 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| NII                     |                     6585.271  | 2.91e-3 | 8.65e-6 |    6575.3 -- 6595.3 |       6483.0 -- 6513.0 |     6623.0 -- 6653.0 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| HeI                     |                     6679.9956 |         |         |    6670.0 -- 6690.0 |       6652.0 -- 6670.0 |     6690.0 -- 6708.0 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| SII                     |                     6718.294  |         |         |    6711.3 -- 6725.3 |       6690.0 -- 6708.0 |     6748.0 -- 6768.0 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| SII                     |                     6732.674  |         |         |    6725.7 -- 6739.7 |       6690.0 -- 6708.0 |     6748.0 -- 6768.0 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| HeI                     |                     7067.1252 |         |         |    7057.1 -- 7077.1 |       7037.1 -- 7057.1 |     7077.1 -- 7097.1 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| ArIII                   |                     7137.76   | 3.21e-1 |  1.4e-3 |    7127.8 -- 7147.8 |       7107.8 -- 7127.8 |     7147.8 -- 7167.8 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| ArIV                    |                     7172.68   |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| ArIV                    |                     7239.76   |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| ArIV                    |                     7265.33   |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| OII                     |                     7321.003  |         | 5.19e-2 |                [1]_ |       7291.0 -- 7311.0 |     7342.8 -- 7362.8 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| OII                     |                     7322.01   | 8.37e-3 | 9.07e-2 |    7313.8 -- 7326.8 |       7291.0 -- 7311.0 |     7342.8 -- 7362.8 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| OII                     |                     7331.68   | 9.32e-3 | 7.74e-2 |    7326.8 -- 7339.8 |       7291.0 -- 7311.0 |     7342.8 -- 7362.8 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| OII                     |                     7332.75   | 1.49e-2 | 3.85e-2 |                [1]_ |       7291.0 -- 7311.0 |     7342.8 -- 7362.8 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| ArIV                    |                     7334.17   |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| ArIII                   |                     7753.24   |  8.3e-2 |  1.3e-4 |    7743.2 -- 7763.2 |       7703.2 -- 7743.2 |     7763.2 -- 7803.2 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| P20                     |                     8394.703  |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| P19                     |                     8415.630  |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| P18                     |                     8440.274  |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| P17                     |                     8469.581  |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| P16                     |                     8504.819  |         |         |    8494.8 -- 8514.8 |       8474.8 -- 8494.8 |     8514.8 -- 8534.8 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| P15                     |                     8547.731  |         |         |    8534.8 -- 8557.7 |       8514.8 -- 8534.8 |     8557.7 -- 8587.7 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| P14                     |                     8600.754  |         |         |    8587.7 -- 8610.8 |       8557.7 -- 8587.7 |     8610.8 -- 8650.8 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| P13                     |                     8667.398  |         |         |    8657.4 -- 8677.4 |       8617.4 -- 8657.4 |     8677.4 -- 8717.4 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| P12                     |                     8752.876  |         |         |    8742.9 -- 8762.9 |       8702.9 -- 8742.9 |     8762.9 -- 8802.9 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| :math:`{\rm P}\theta`   |                     8865.216  |         |         |    8855.2 -- 8875.2 |       8815.2 -- 8855.2 |     8875.2 -- 8915.2 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| SIII                    |                     8831.8    |         |         |                     |                        |                      |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| :math:`{\rm P}\eta`     |                     9017.384  |         |         |    9007.4 -- 9027.4 |       8977.4 -- 9007.4 |     9027.4 -- 9057.4 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| SIII                    |                     9071.1    | 1.85e-2 | 3.94e-5 |    9061.1 -- 9081.1 |       9026.1 -- 9061.1 |     9081.1 -- 9116.1 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| :math:`{\rm P}\zeta`    |                     9231.546  |         |         |    9221.5 -- 9241.5 |       9181.5 -- 9221.5 |     9241.5 -- 9281.5 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| SIII                    |                     9533.2    | 4.78e-2 | 2.09e-4 |    9525.5 -- 9540.9 |       9483.2 -- 9523.2 |     9558.6 -- 9598.6 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| :math:`{\rm P}\epsilon` |                     9548.588  |         |         |    9540.9 -- 9556.3 |       9483.2 -- 9523.2 |     9558.6 -- 9598.6 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
-| :math:`{\rm P}\delta`   |                    10052.123  |         |         |  10042.1 -- 10062.1 |     10002.1 -- 10042.1 |   10062.1 -- 10102.1 |
-+-------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| Name                         |  Rest :math:`\lambda` (|ang|) |      M1 |      E2 | EW Passband (|ang|) |  Blue Passband (|ang|) | Red Passband (|ang|) |
++==============================+===============================+=========+=========+=====================+========================+======================+
+| HeII [3]_                    |                     3204.019  |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| NeIII                        |                      3343.14  |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| NeV                          |                     3346.783  | 1.38e-1 |  6.2e-5 |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| NeV                          |                     3426.864  | 3.82e-1 |  3.9e-4 |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| NI [3]_                      |                     3467.513  |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| H25                          |                     3670.5155 |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| H24                          |                     3672.5279 |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| H23                          |                     3674.8110 |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| H22                          |                     3677.4160 |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| H21                          |                     3680.4065 |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| H20                          |                     3683.8627 |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| H19                          |                     3687.8871 |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| H18                          |                     3692.6119 |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| H17                          |                     3698.2103 |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| H16                          |                     3704.9132 |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| H15                          |                     3713.0334 |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| H14                          |                     3723.0035 |         |         |                [1]_ |       3706.3 -- 3716.3 |     3738.6 -- 3748.6 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| OII                          |                     3727.092  | 1.59e-4 | 1.86e-5 |    3716.3 -- 3738.3 |       3706.3 -- 3716.3 |     3738.6 -- 3748.6 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| OII                          |                     3729.875  | 1.98e-6 | 2.86e-5 |                [1]_ |       3706.3 -- 3716.3 |     3738.6 -- 3748.6 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| H13                          |                     3735.4365 |         |         |                [1]_ |       3706.3 -- 3716.3 |     3738.6 -- 3748.6 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| H12 [4]_                     |                     3751.2174 |         |         |    3746.2 -- 3756.2 |       3738.6 -- 3748.6 |     3756.6 -- 3766.6 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| H11 [4]_                     |                     3771.7012 |         |         |    3761.7 -- 3781.7 |       3756.6 -- 3766.6 |     3779.1 -- 3789.1 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| :math:`{\rm H}\theta` [4]_   |                     3798.9757 |         |         |    3789.0 -- 3809.0 |       3776.5 -- 3791.5 |     3806.5 -- 3821.5 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| :math:`{\rm H}\eta` [4]_     |                     3836.4720 |         |         |    3826.5 -- 3846.5 |       3806.5 -- 3826.5 |     3900.2 -- 3920.2 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| NeIII                        |                     3869.86   | 1.74e-1 |         |    3859.9 -- 3879.9 |       3806.5 -- 3826.5 |     3900.2 -- 3920.2 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| HeI [3]_                     |                     3889.749  |         |         |                [1]_ |       3806.5 -- 3826.5 |     3900.2 -- 3920.2 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| :math:`{\rm H}\zeta` [4]_    |                     3890.1506 |         |         |    3880.2 -- 3900.2 |       3806.5 -- 3826.5 |     3900.2 -- 3920.2 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| NeIII                        |                     3968.59   | 5.40e-2 |         |                [1]_ |       3938.6 -- 3958.6 |     3978.6 -- 3998.6 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| :math:`{\rm H}\epsilon` [4]_ |                     3971.1951 |         |         |    3961.2 -- 3981.2 |       3941.2 -- 3961.2 |     3981.2 -- 4001.2 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| HeI [3]_                     |                     4027.328  |         |         |    4017.3 -- 4037.3 |       3997.3 -- 4017.3 |     4037.3 -- 4057.3 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| SII                          |                     4069.749  | 1.92e-1 | 9.53e-8 |    4062.7 -- 4073.6 |       4049.7 -- 4062.7 |     4082.0 -- 4092.9 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| SII                          |                     4077.500  | 7.72e-2 | 1.16e-6 |    4073.6 -- 4084.5 |       4049.7 -- 4062.7 |     4082.0 -- 4092.9 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| :math:`{\rm H}\delta` [4]_   |                     4102.8922 |         |         |    4092.9 -- 4112.9 |       4082.0 -- 4092.9 |     4112.9 -- 4132.9 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| :math:`{\rm H}\gamma` [4]_   |                     4341.6837 |         |         |    4331.7 -- 4351.7 |       4311.7 -- 4331.7 |     4349.7 -- 4358.7 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| OIII                         |                     4364.436  | 1.71e+0 |         |    4358.7 -- 4374.4 |       4349.7 -- 4358.7 |     4374.4 -- 4384.4 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| HeI [3]_                     |                     4472.734  |         |         |    4462.7 -- 4482.7 |       4442.7 -- 4462.7 |     4482.7 -- 4502.7 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| HeII [3]_                    |                     4687.015  |         |         |    4677.0 -- 4697.0 |       4667.0 -- 4677.0 |     4697.0 -- 4707.0 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| ArIV [2]_                    |                     4712.58   | 9.6e-3  |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| HeI [3]_                     |                     4714.466  |         |         |    4707.0 -- 4722.0 |       4697.0 -- 4707.0 |     4722.0 -- 4732.0 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| ArIV                         |                     4741.45   |  7.2e-2 |  5.1e-3 |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| :math:`{\rm H}\beta` [4]_    |                     4862.6830 |         |         |    4852.7 -- 4872.7 |       4798.9 -- 4838.9 |     4885.6 -- 4925.6 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| HeI                          |                     4923.3051 |         |         |    4913.3 -- 4933.3 |       4898.3 -- 4913.3 |     4933.3 -- 4948.3 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| OIII                         |                     4960.295  | 6.21e-3 | 4.57e-6 |    4950.3 -- 4970.3 |       4930.3 -- 4950.3 |     4970.3 -- 4990.3 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| OIII                         |                     5008.240  | 1.81e-2 | 3.52e-5 |    4998.2 -- 5018.2 |       4978.2 -- 4998.2 |     5028.2 -- 5048.2 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| HeI                          |                     5017.0769 |         |         |                [1]_ |       4988.2 -- 4983.2 |     5028.2 -- 5048.2 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| ArIII                        |                       5193.27 |         | 3.10e+0 |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| NI                           |                     5199.349  | 1.60e-5 | 4.34e-6 |    5189.3 -- 5209.3 |       5169.4 -- 5189.3 |     5211.7 -- 5231.7 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| NI                           |                     5201.705  | 9.71e-7 | 6.59e-6 |                [1]_ |       5169.4 -- 5189.4 |     5211.7 -- 5231.7 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| OI                           |                      5578.887 |         | 1.26e+0 |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| NII                          |                     5756.19   |         | 1.14e+0 |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| HeI [3]_                     |                     5877.252  |         |         |    5867.2 -- 5887.2 |       5847.2 -- 5867.2 |     5887.2 -- 5907.2 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| NaI                          |                     5891.583  |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| NaI                          |                     5897.558  |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| OI                           |                     6302.046  | 5.63e-3 | 2.11e-5 |    6292.0 -- 6312.0 |       6272.0 -- 6292.0 |     6312.0 -- 6332.0 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| OI                           |                     6365.536  | 1.82e-3 | 3.39e-6 |    6355.5 -- 6375.5 |       6335.5 -- 6355.5 |     6375.5 -- 6395.5 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| NII                          |                     6549.86   | 9.84e-4 | 9.22e-7 |    6542.9 -- 6556.9 |       6483.0 -- 6513.0 |     6623.0 -- 6653.0 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| HeII [3]_                    |                     6561.890  |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| :math:`{\rm H}\alpha` [4]_   |                     6564.608  |         |         |    6557.6 -- 6571.6 |       6483.0 -- 6513.0 |     6623.0 -- 6653.0 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| NII                          |                     6585.27   | 2.91e-3 | 8.65e-6 |    6575.3 -- 6595.3 |       6483.0 -- 6513.0 |     6623.0 -- 6653.0 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| HeI                          |                     6679.9956 |         |         |    6670.0 -- 6690.0 |       6652.0 -- 6670.0 |     6690.0 -- 6708.0 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| SII                          |                     6718.295  | 1.39e-5 | 1.88e-4 |    6711.3 -- 6725.3 |       6690.0 -- 6708.0 |     6748.0 -- 6768.0 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| SII                          |                     6732.674  | 5.63e-4 | 1.21e-4 |    6725.7 -- 6739.7 |       6690.0 -- 6708.0 |     6748.0 -- 6768.0 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| HeI [3]_                     |                      7067.144 |         |         |    7057.1 -- 7077.1 |       7037.1 -- 7057.1 |     7077.1 -- 7097.1 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| HeI                          |                    7067.65683 |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| ArIII                        |                     7137.76   | 3.21e-1 |  1.4e-3 |    7127.8 -- 7147.8 |       7107.8 -- 7127.8 |     7147.8 -- 7167.8 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| ArIV                         |                     7172.67   |  8.1e-1 |  9.8e-2 |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| ArIV                         |                     7239.77   | 4.44e-1 | 2.26e-1 |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| ArIV                         |                     7265.33   | 4.88e-1 | 1.90e-1 |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| HeI                          |                     7283.3571 |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| OII                          |                     7320.94   |         | 5.19e-2 |                [1]_ |       7291.0 -- 7311.0 |     7342.8 -- 7362.8 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| OII                          |                     7322.01   | 8.37e-3 | 9.07e-2 |    7313.8 -- 7326.8 |       7291.0 -- 7311.0 |     7342.8 -- 7362.8 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| OII                          |                     7331.68   | 9.32e-3 | 7.74e-2 |    7326.8 -- 7339.8 |       7291.0 -- 7311.0 |     7342.8 -- 7362.8 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| OII                          |                     7332.75   | 1.49e-2 | 3.85e-2 |                [1]_ |       7291.0 -- 7311.0 |     7342.8 -- 7362.8 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| ArIV                         |                     7334.17   |         | 1.22e-1 |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| ArIII                        |                     7753.24   |  8.3e-2 |  1.3e-4 |    7743.2 -- 7763.2 |       7703.2 -- 7743.2 |     7763.2 -- 7803.2 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| ArIII                        |                     8038.73   |         |  2.9e-5 |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| P20                          |                     8394.703  |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| P19                          |                     8415.630  |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| P18                          |                     8440.274  |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| P17                          |                     8469.581  |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| P16                          |                     8504.819  |         |         |    8494.8 -- 8514.8 |       8474.8 -- 8494.8 |     8514.8 -- 8534.8 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| P15                          |                     8547.731  |         |         |    8534.8 -- 8557.7 |       8514.8 -- 8534.8 |     8557.7 -- 8587.7 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| P14                          |                     8600.754  |         |         |    8587.7 -- 8610.8 |       8557.7 -- 8587.7 |     8610.8 -- 8650.8 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| P13                          |                     8667.398  |         |         |    8657.4 -- 8677.4 |       8617.4 -- 8657.4 |     8677.4 -- 8717.4 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| P12                          |                     8752.876  |         |         |    8742.9 -- 8762.9 |       8702.9 -- 8742.9 |     8762.9 -- 8802.9 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| SIII                         |                     8831.8    |         | 5.25e-6 |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| :math:`{\rm P}\theta`        |                     8865.216  |         |         |    8855.2 -- 8875.2 |       8815.2 -- 8855.2 |     8875.2 -- 8915.2 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| :math:`{\rm P}\eta`          |                     9017.384  |         |         |    9007.4 -- 9027.4 |       8977.4 -- 9007.4 |     9027.4 -- 9057.4 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| SIII                         |                     9071.1    | 1.85e-2 | 3.94e-5 |    9061.1 -- 9081.1 |       9026.1 -- 9061.1 |     9081.1 -- 9116.1 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| HeI [3]_                     |                     9212.862  |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| :math:`{\rm P}\zeta`         |                     9231.546  |         |         |    9221.5 -- 9241.5 |       9181.5 -- 9221.5 |     9241.5 -- 9281.5 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| SIII                         |                     9533.2    | 4.78e-2 | 2.09e-4 |    9525.5 -- 9540.9 |       9483.2 -- 9523.2 |     9558.6 -- 9598.6 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| :math:`{\rm P}\epsilon`      |                     9548.588  |         |         |    9540.9 -- 9556.3 |       9483.2 -- 9523.2 |     9558.6 -- 9598.6 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| HeI [3]_                     |                     9528.778  |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| HeI [3]_                     |                    10030.470  |         |         |                     |                        |                      |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
+| :math:`{\rm P}\delta`        |                    10052.123  |         |         |  10042.1 -- 10062.1 |     10002.1 -- 10042.1 |   10062.1 -- 10102.1 |
++------------------------------+-------------------------------+---------+---------+---------------------+------------------------+----------------------+
 
 .. _emissionlines-moments:
 
@@ -341,7 +363,7 @@ The columns of the parameter file are:
 +-------------------+-----------+-----------------------------------------------------------------------+
 | ``name``          | str       | Name of the transition.                                               |
 +-------------------+-----------+-----------------------------------------------------------------------+
-| ``lambda``        | float     | Rest frame wavelength of the emission line to analyze.                |
+| ``restwave``      | float     | Rest frame wavelength of the emission line to analyze.                |
 +-------------------+-----------+-----------------------------------------------------------------------+
 | ``waveref``       | str       | The reference frame of the wavelengths; must be either 'air' for air  |
 |                   |           | or 'vac' for vacuum.                                                  |
@@ -349,53 +371,22 @@ The columns of the parameter file are:
 | ``action``        | str       | A single character setting how the line should be treated.  See       |
 |                   |           | :ref:`emission-line-modeling-action`.                                 |
 +-------------------+-----------+-----------------------------------------------------------------------+
-| ``relative_flux`` | float     | Relative flux of the emission lines.  This should most often be unity |
-|                   |           | when the flux is not tied to another line; see                        |
-|                   |           | :ref:`emission-line-modeling-mode`.                                   |
-+-------------------+-----------+-----------------------------------------------------------------------+
-| ``mode``          | str       | Fitting mode for the line.  See :ref:`emission-line-modeling-mode`.   |
-+-------------------+-----------+-----------------------------------------------------------------------+
-| ``profile``       | str       | The name of the class used to construct the line profile.  The        |
-|                   |           | available options are any of the classes in                           |
-|                   |           | :mod:`mangadap.util.lineprofiles`.  This functionality will likely be |
-|                   |           | deprecated because the lineprofile should essentially always be       |
-|                   |           | :class:`~mangadap.util.lineprofiles.FFTGaussianLSF`; selected by      |
-|                   |           | setting this parameter to "FFTGaussianLSF".                           |
-+-------------------+-----------+-----------------------------------------------------------------------+
-| ``ncomp``         | int       | The number of components to fit.  **NOT TYPICALLY USED!**             |
-+-------------------+-----------+-----------------------------------------------------------------------+
-| ``output_model``  | int       | Flag to include the best-fitting model of the line in the             |
-|                   |           | emission-line model spectrum.  **NOT TYPICALLY USED!**                |
-+-------------------+-----------+-----------------------------------------------------------------------+
-| ``par``           | float[3]  | A list of the initial guess for the line profile parameters.          |
-|                   |           | **NOT TYPICALLY USED!** The number of parameters must match the       |
-|                   |           | struct declaration at the top of the file.  The initial parameters    |
-|                   |           | are automatically adjusted to provide any designated flux ratios, and |
-|                   |           | the center is automatically adjusted to the provided redshift for the |
-|                   |           | spectrum.  For example, for a GaussianLineProfile, this is typically  |
-|                   |           | set to "{1.0 0.0 100.0}".                                             |
-+-------------------+-----------+-----------------------------------------------------------------------+
-| ``fix``           | int[3]    | A list of flags for fixing the input guess parameters during the fit. |
-|                   |           | **NOT TYPICALLY USED!** Use 0 for a free parameter, 1 for a fixed     |
-|                   |           | parameter.  The parameter value is only fixed *AFTER* adjusted in the |
-|                   |           | flux and or center based on the redshift and the implied tied         |
-|                   |           | parameters.  For a free set of parameters using a                     |
-|                   |           | GaussianLineProfile, this is set to "{ 0 0 0 }".                      |
-+-------------------+-----------+-----------------------------------------------------------------------+
-| ``lower_bound``   | str[3]    | A list of lower bounds for the parameters.  **NOT TYPICALLY USED!**   |
-|                   |           | For each parameter, use None to indicate no lower bound.  For a       |
-|                   |           | GaussianLineProfile with positive flux and standard deviation, this   |
-|                   |           | is set to '{ 0.0 None 0.0 }'.                                         |
-+-------------------+-----------+-----------------------------------------------------------------------+
-| ``upper_bound``   | str[3]    | A list of upper bounds for the parameters.  **NOT TYPICALLY USED!**   |
-|                   |           | For each parameter, use None to indicate no upper bound.  For a       |
-|                   |           | GaussianLineProfile with maximum standard deviation of 800 km/s, this |
-|                   |           | is set to '{ None None 800.0 }'.                                      |
-+-------------------+-----------+-----------------------------------------------------------------------+
-| ``log_bounded``   | int[3]    | A list of flags used when determining if a fit parameter is near the  |
-|                   |           | imposed boundary.  **NOT TYPICALLY USED!** If true, the fraction of   |
-|                   |           | the boundary range used is done in logarithmic, not linear,           |
-|                   |           | separation.  Use 0 for False, 1 for True.                             |
+| ``tie``           | str[4]    | A sequence of 4 strings that indicate how the line should be tied to  |
+|                   |           | other lines.  The first element specifies the line to which to tie    |
+|                   |           | the line specified in this row, indicated by its line ``index``.  The |
+|                   |           | next three entries indicate how to tie each of the 3 Gaussian         |
+|                   |           | parameters: flux, velocity, and velocity dispersion.  To leave the    |
+|                   |           | parameter untied, this should be ``None``.  To force the parameter to |
+|                   |           | be identical to the parameter for the tied line, use ``=``.  For the  |
+|                   |           | flux, the flux can be specified to be a specific factor of the tied   |
+|                   |           | line; e.g., ``=0.30`` forces the flux of this line to be 0.3 times    |
+|                   |           | the flux of the tied line.  For the velocity and velocity dispersion, |
+|                   |           | a single value can be used to set a the tied parameter to be within   |
+|                   |           | the specified fraction of the tied parameter.  I.e., a value of       |
+|                   |           | ``1.4`` for the velocity dispersion parameter means the velocity      |
+|                   |           | dispersion of this line should be within                              |
+|                   |           | :math:`\sigma_t/1.4 < \sigma < 1.4 \sigma_t`, where :math:`\sigma_t`  |
+|                   |           | is the velocity dispersion of the tied line.                          |
 +-------------------+-----------+-----------------------------------------------------------------------+
 | ``blueside``      | float[2]  | A two-element vector with the starting and ending wavelength for a    |
 |                   |           | passband to the blue of the primary band.                             |
@@ -411,28 +402,20 @@ and an example file might look like this:
     typedef struct {
         int index;
         char name[6];
-        double lambda;
+        double restwave;
         char waveref[3];
         char action;
-        double relative_flux;
-        char mode[6];
-        char profile[30];
-        int ncomp;
-        int output_model;
-        double par[3];
-        int fix[3];
-        char lower_bound[3][10];
-        char upper_bound[3][10];
-        int log_bounded[3];
+        char tie[4][10];
         double blueside[2];
         double redside[2];
     } DAPEML;
 
-    DAPEML   2  OII     3727.092   vac  f   1.00  v34  FFTGaussianLSF  1  1  { 1.0 0.0 100.0 }  { 0 0 0 }  {  0.0 None 30.0 }  { None None 400. }  { 0 0 1 }  { 3706.3  3716.3 } { 3738.6  3748.6 }
-    DAPEML   3  OII     3729.875   vac  f   1.00   k2  FFTGaussianLSF  1  1  { 1.0 0.0 100.0 }  { 0 0 0 }  {  0.0 None 30.0 }  { None None 400. }  { 0 0 1 }  { 3706.3  3716.3 } { 3738.6  3748.6 }
-    DAPEML  33  NII     6549.86    vac  f   0.34  a35  FFTGaussianLSF  1  1  { 1.0 0.0 100.0 }  { 0 0 0 }  {  0.0 None 30.0 }  { None None 400. }  { 0 0 1 }  { 6483.0  6513.0 } { 6623.0  6653.0 }
-    DAPEML  34  Ha      6564.632   vac  f   1.00    f  FFTGaussianLSF  1  1  { 1.0 0.0 100.0 }  { 0 0 0 }  {  0.0 None 30.0 }  { None None 400. }  { 0 0 1 }  { 6483.0  6513.0 } { 6623.0  6653.0 }
-    DAPEML  35  NII     6585.271   vac  f   1.00  v34  FFTGaussianLSF  1  1  { 1.0 0.0 100.0 }  { 0 0 0 }  {  0.0 None 30.0 }  { None None 400. }  { 0 0 1 }  { 6483.0  6513.0 } { 6623.0  6653.0 }
+    DAPEML   2  OII     3727.092   vac  f  {   34   None    = None }  {  3706.3  3716.3 }  {  3738.6  3748.6 }
+    DAPEML   3  OII     3729.875   vac  f  {    2   None    =    = }  {  3706.3  3716.3 }  {  3738.6  3748.6 }
+    DAPEML  23  Hb      4862.6830  vac  f  {   34   None    =  1.4 }  {  4798.9  4838.9 }  {  4885.6  4925.6 }
+    DAPEML  33  NII     6549.86    vac  f  {   35  =0.34    =    = }  {  6483.0  6513.0 }  {  6623.0  6653.0 }
+    DAPEML  34  Ha      6564.608   vac  f  { None   None None None }  {  6483.0  6513.0 }  {  6623.0  6653.0 }
+    DAPEML  35  NII     6585.27    vac  f  {   34   None    = None }  {  6483.0  6513.0 }  {  6623.0  6653.0 }
 
 .. note::
 
@@ -441,12 +424,11 @@ and an example file might look like this:
       width calculations.  Nominally, these should be the same, but it's
       up to the person that writes the two parameter files to make sure
       that is true.
-    * Many of the current parameters in the emission-line modeling
-      parameter file are hold-overs from when
-      :class:`~mangadap.proc.elric.Elric` was the standard class used
-      for the emission-line fitting. Anything marked as "NOT
-      TYPICALLY USED" hasn't been adapted for use with the currently
-      preferred module, :class:`~mangadap.proc.sasuke.Sasuke`.
+    
+    * The format of this file has changed in version 3.1.0 in a way that
+      removes many of the parameters used by the
+      :class:`~mangadap.proc.elric.Elric` fitter. That class is effectively
+      now deprecated.
 
 .. _emission-line-modeling-action:
 
@@ -460,6 +442,10 @@ Emission-Line "Actions"
 Emission-Line "Modes"
 +++++++++++++++++++++
 
+.. warning::
+
+    This parameter is now DEPRECATED in favor of the ``tie`` parameter.
+
 .. include:: include/emissionline-mode.rst
 
 Changing the modeling parameters
@@ -491,5 +477,7 @@ parameters used by
 ----
 
 .. [1] No primary band defined because it overlaps with another line.
-
+.. [2] Provided magnetic dipole coefficient is actually its sum with the electric quadrupole coefficient.
+.. [3] Wavelength based on a simple average of wavelengths for many fine-structure transitions.
+.. [4] Center of gravity of the blending of fine-structure lines assuming Boltzmann populations in an optically thin plasma; see, e.g.: https://physics.nist.gov/cgi-bin/ASBib1/get_ASBib_ref.cgi?db=el&db_id=&comment_code=c69&element=H&spectr_charge=1&ref=&type=
 
diff --git a/docs/gettingstarted.rst b/docs/gettingstarted.rst
index f28ecee8..c9876a71 100644
--- a/docs/gettingstarted.rst
+++ b/docs/gettingstarted.rst
@@ -77,35 +77,39 @@ The DAP analyzes each DRP-produced datacube multiple ways. Each
 The ``DAPTYPEs`` in DR15 are:
 
  * ``VOR10-GAU-MILESHC``: Analysis of spectra binned to :math:`{\rm
-   S/N}\sim10` using the Voronoi binning algorithm (Cappellari & Copin
-   2003) 
+   S/N}\sim10` using the Voronoi binning algorithm `Cappellari & Copin (2003,
+   MNRAS, 342, 345)`_
 
  * ``HYB10-GAU-MILESHC``: Stellar-continuum analysis of spectra
    binned to :math:`{\rm S/N}\sim10` for the stellar kinematics (same as
    the ``VOR10`` approach); however, the emission-line measurements are
    performed on the individual spaxels.
 
-The ``DAPTYPEs`` in MPL-10 are:
+The ``DAPTYPEs`` in MPL-11 are:
 
- * ``SPX-MILESHC-MASTARHC2``: Analysis of each individual spaxel; spaxels
+ * ``SPX-MILESHC-MASTARSSP``: Analysis of each individual spaxel; spaxels
    must have a valid continuum fit for an emission-line model to be fit
 
- * ``VOR10-MILESHC-MASTARHC2``: Analysis of spectra binned to :math:`{\rm
-   S/N}\sim10` using the Voronoi binning algorithm (Cappellari & Copin
-   2003) 
+ * ``VOR10-MILESHC-MASTARSSP``: Analysis of spectra binned to :math:`{\rm
+   S/N}\sim10` using the Voronoi binning algorithm `Cappellari & Copin (2003,
+   MNRAS, 342, 345)`_
 
- * ``HYB10-MILESHC-MASTARHC2``: Stellar-continuum analysis of spectra
+ * ``HYB10-MILESHC-MASTARSSP``: Stellar-continuum analysis of spectra
    binned to :math:`{\rm S/N}\sim10` for the stellar kinematics (same
    as the ``VOR10`` approach); however, the emission-line and
    spectral-index measurements are performed on the individual
    spaxels.
 
+ * ``HYB10-MILESHC-MASTARHC2``: Same as the above except the hierarchically
+   clustered MaStar stellar spectra are used to fit the stellar continuum in
+   the emission-line module.
+
 The type of analysis that you should use will depend on your science
 application. In all cases, please consult `Westfall et al. (2019, AJ,
 158, 231)`_ and `Belfiore et al. (2019, AJ, 158, 160)`_ for usage
 guidelines and limitations of the data.
 
-SPX-MILESHC-MASTARHC2 (MPL-10 only)
+SPX-MILESHC-MASTARSSP (MPL-11 only)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 These are useful for most science applications that can push to very
@@ -117,7 +121,10 @@ Important considerations:
  * Spectra with :math:`g`-band :math:`{\rm S/N} < 1` will not have a
    stellar-continuum model or Gaussian emission-line models.
 
-VOR10-GAU-MILESHC (DR15), VOR10-MILESHC-MASTARHC2 (MPL-10)
+ * Beware of biases in the stellar velocity dispersion with :math:`{\rm
+   S/N}_g < 10`; cf. `Westfall et al. (2019, AJ, 158, 231)`_
+
+VOR10-GAU-MILESHC (DR15), VOR10-MILESHC-MASTARSSP (MPL-11)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 These data are geared toward stellar kinematics, where the data are
@@ -142,8 +149,8 @@ Important considerations:
    limits the emission-line science that can be done at low continuum
    S/N.
 
-HYB10-GAU-MILESHC (DR15), HYB10-MILESHC-MASTARHC2 (MPL-10)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+HYB10-GAU-MILESHC (DR15), HYB10-MILESHC-MASTARSSP (MPL-11), HYB10-MILESHC-MASTARHC2 (MPL-11)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 These are the default files that most users will want to use. We
 first Voronoi-binned the spectra to a :math:`g`-band :math:`{\rm
@@ -184,7 +191,7 @@ The primary output files are located at:
 +===============+
 |   `DR15 SAS`_ |
 +---------------+
-| `MPL-10 SAS`_ |
+| `MPL-11 SAS`_ |
 +---------------+
 
 There are two main output files for each observation
@@ -193,7 +200,7 @@ There are two main output files for each observation
  * ``manga-[PLATE]-[IFUDESIGN]-MAPS-[DAPTYPE].fits.gz``, see
    :ref:`datamodel-maps`: 2D "maps" (i.e., images) of DAP measured
    properties.
- * ``manga-[PLATE]-[IFUDESIGN]-LOGCUBE-[type].fits.gz``, see
+ * ``manga-[PLATE]-[IFUDESIGN]-LOGCUBE-[DAPTYPE].fits.gz``, see
    :ref:`datamodel-cube`: 3D data cubes with the binned and
    best-fitting-model spectra.
 
@@ -236,7 +243,7 @@ System (WCS) and should exactly match that of the DRP output
 
 Many properties have multiple "species" or channels associated with
 them. The identifying name of each mapped property is provided in the
-header; e.g., the emission lines fit in MPL-10 are listed :ref:`here
+header; e.g., the emission lines fit in MPL-11 are listed :ref:`here
 <datamodel-emission-line-channels>` as they appear in the header of
 the relevant ``MAPS`` file extension (e.g., ``EMLINE_GFLUX``). In
 python, you can create a dictionary of items in each channel using
@@ -260,16 +267,17 @@ the following method:
             channel_dict[v] = i
     return channel_dict
 
-This is identical to :func:`mangadap.util.fileio.channel_dictionary`,
-such that you cand do the following:
+This is identical to :func:`~mangadap.util.fileio.channel_dictionary`,
+such that you can do the following:
 
 .. code-block:: python
 
     from mangadap.util.fileio import channel_dictionary
     from astropy.io import fits
 
-    hdu = fits.open('mangadap-7495-12704-MAPS-SPX-MILESHC-MASTARHC2.fits.gz')
+    hdu = fits.open('manga-8138-12704-MAPS-HYB10-MILESHC-MASTARSSP.fits.gz')
     emlc = channel_dictionary(hdu, 'EMLINE_GFLUX')
+    ha_flux = hdu['EMLINE_GFLUX'].data[emlc['Ha-6564']]
 
 In general, it is best to **select the extension and channel based on
 its name**, *not* its number. This is because the ordering of, e.g.,
@@ -290,7 +298,7 @@ For example, we provide a python code snippet below that will plot the
 :math:`{\rm H}\alpha` flux map, stellar velocity field, the corrected
 stellar velocity dispersion field, and the corrected :math:`{\rm
 H}\beta` index map for
-`manga-8138-12704-MAPS-HYB10-MILESHC-MASTARHC2.fits.gz`_.
+`manga-8138-12704-MAPS-HYB10-MILESHC-MASTARSSP.fits.gz`_.
 Importantly, note the use of the :ref:`corrections`!!
 
 .. code-block:: python
@@ -310,7 +318,7 @@ Importantly, note the use of the :ref:`corrections`!!
         return indx * indxcorr if unit in ['ang',''] else indx + indxcorr
 
     # Open the fits file
-    hdu = fits.open('manga-8138-12704-MAPS-HYB10-MILESHC-MASTARHC2.fits.gz')
+    hdu = fits.open('manga-8138-12704-MAPS-HYB10-MILESHC-MASTARSSP.fits.gz')
 
     # Build dictionaries with the emission-line and spectral-index
     # channel names to ease selection and get the spectral-index units
@@ -320,8 +328,8 @@ Importantly, note the use of the :ref:`corrections`!!
 
     # Show the Gaussian-fitted H-alpha flux map
     mask_ext = hdu['EMLINE_GFLUX'].header['QUALDATA']
-    halpha_flux = numpy.ma.MaskedArray(hdu['EMLINE_GFLUX'].data[emlc['Ha-6564'],:,:],
-                                       mask=hdu[mask_ext].data[emlc['Ha-6564'],:,:] > 0)
+    halpha_flux = numpy.ma.MaskedArray(hdu['EMLINE_GFLUX'].data[emlc['Ha-6564']],
+                                       mask=hdu[mask_ext].data[emlc['Ha-6564']] > 0)
 
     pyplot.imshow(halpha_flux, origin='lower', interpolation='nearest', cmap='inferno')
     pyplot.colorbar()
@@ -339,7 +347,7 @@ Importantly, note the use of the :ref:`corrections`!!
     # Show the corrected stellar velocity dispersion field
     mask_ext = hdu['STELLAR_SIGMA'].header['QUALDATA']
     stellar_sfield_sqr = numpy.ma.MaskedArray(numpy.square(hdu['STELLAR_SIGMA'].data)
-                                              - numpy.square(hdu['STELLAR_SIGMACORR'].data[0,:,:]),
+                                              - numpy.square(hdu['STELLAR_SIGMACORR'].data[0]),
                                               mask=hdu[mask_ext].data > 0)
     # WARNING: This will ignore any data where the correction is larger than the measurement
     stellar_sfield = numpy.ma.sqrt(stellar_sfield_sqr)
@@ -350,10 +358,10 @@ Importantly, note the use of the :ref:`corrections`!!
 
     # Show the corrected H-beta index map
     mask_ext = hdu['SPECINDEX'].header['QUALDATA']
-    hbeta_index_raw = numpy.ma.MaskedArray(hdu['SPECINDEX'].data[spic['Hb'],:,:],
-                                           mask=hdu[mask_ext].data[spic['Hb'],:,:] > 0)
+    hbeta_index_raw = numpy.ma.MaskedArray(hdu['SPECINDEX'].data[spic['Hb']],
+                                           mask=hdu[mask_ext].data[spic['Hb']] > 0)
     hbeta_index = apply_index_dispersion_correction(hbeta_index_raw,
-                                                    hdu['SPECINDEX_CORR'].data[spic['Hb'],:,:],
+                                                    hdu['SPECINDEX_CORR'].data[spic['Hb']],
                                                     spiu[spic['Hb']])
     
     pyplot.imshow(hbeta_index, origin='lower', interpolation='nearest', cmap='inferno')
@@ -410,7 +418,7 @@ any problems!
 For example, we provide a python code snippet below that plots the
 highest S/N spectrum, the full model, the residuals, the model
 stellar continuum, and the model emission-line spectrum using
-`manga-8138-12704-MAPS-HYB10-MILESHC-MASTARHC2.fits.gz`_.
+`manga-8138-12704-LOGCUBE-HYB10-MILESHC-MASTARSSP.fits.gz`_.
 Importantly, note the use of the :ref:`metadatamodel-maskbits`!!
 
 .. code-block:: python
@@ -424,11 +432,11 @@ Importantly, note the use of the :ref:`metadatamodel-maskbits`!!
     from mangadap.dapfits import DAPCubeBitMask
 
     # Open the fits file
-    hdu_maps = fits.open('manga-8138-12704-MAPS-SPX-MILESHC-MASTARHC2.fits.gz')
-    hdu_cube = fits.open('manga-8138-12704-LOGCUBE-SPX-MILESHC-MASTARHC2.fits.gz')
+    hdu_maps = fits.open('manga-8138-12704-MAPS-SPX-MILESHC-MASTARSSP.fits.gz')
+    hdu_cube = fits.open('manga-8138-12704-LOGCUBE-SPX-MILESHC-MASTARSSP.fits.gz')
 
     # Get the S/N per bin from the MAPS file
-    snr = numpy.ma.MaskedArray(hdu_maps['BIN_SNR'].data, mask=hdu_maps['BINID'].data[0,:,:] < 0)
+    snr = numpy.ma.MaskedArray(hdu_maps['BIN_SNR'].data, mask=hdu_maps['BINID'].data[0] < 0)
 
     # Select the bin/spaxel with the highest S/N and get the relevant map coordiantes
     k = numpy.ma.argmax(snr.ravel())
@@ -468,7 +476,7 @@ DAPall file
 for all analyses done for a given MPL/DR.
 
 The name of the file is ``dapall-$MANGADRP_VER-$MANGADAP_VER.fits``;
-for example, this is ``dapall-v3_0_1-3.0.1.fits`` in MPL-10.
+for example, this is ``dapall-v3_1_1-3.1.0.fits`` in MPL-11.
 
 This file is used primarily for sample selection, and it has many
 limitations (e.g., it provides star-formation rates calculated
@@ -483,14 +491,13 @@ DAPall file.
     from matplotlib import pyplot
     from astropy.io import fits
 
-    drpall = fits.open('drpall-v2_7_1.fits')['MANGA'].data
-    dapall_hdu = fits.open('dapall-v2_7_1-2.4.1.fits')
-    dapall = dapall_hdu['DAPALL'].data
+    drpall = fits.open('drpall-v3_1_1.fits')['MANGA'].data
+    daptype = 'HYB10-MILESHC-MASTARSSP'
+    dapall = fits.open('dapall-v3_1_1-3.1.0.fits')[daptype]
     mass = drpall['nsa_sersic_mass'][dapall['DRPALLINDX']]
 
-    daptype = 'HYB10-MILESHC-MASTARHC'
-    indx = (dapall['DAPDONE'] == 1) & (dapall['DAPTYPE'] == daptype) & (dapall['DAPQUAL'] == 0) \
-            & (mass > 0) & (dapall['SFR_TOT'] > -999)
+    indx = (dapall['DAPDONE'] == 1) & (dapall['DAPQUAL'] == 0) & (mass > 0) \
+                & (dapall['SFR_TOT'] > -999)
 
     pyplot.scatter(mass[indx], dapall['SFR_TOT'][indx], marker='.', s=20, lw=0, color='k')
     pyplot.xlim([1e8, 1e12])
@@ -533,7 +540,7 @@ For example:
     bm = BitMask.from_par_file(sdssMaskbits, 'MANGA_DAPQUAL')
 
     # Read a DAP file
-    hdu = fits.open('manga-8138-12704-MAPS-SPX-MILESHC-MASTARHC2.fits.gz')
+    hdu = fits.open('manga-8138-12704-MAPS-SPX-MILESHC-MASTARSSP.fits.gz')
 
     # Check if the file is critical and print the result
     dap_file_is_critical = bm.flagged(hdu['PRIMARY'].header['DAPQUAL'], flag='CRITICAL')
@@ -610,14 +617,14 @@ measure stellar velocity.
     from mangadap.util.fitsutil import DAPFitsUtil
 
     # Read a DAP MAPS file
-    hdu = fits.open('manga-8138-12704-MAPS-HYB10-MILESHC-MASTARHC2.fits.gz')
+    hdu = fits.open('manga-8138-12704-MAPS-HYB10-MILESHC-MASTARSSP.fits.gz')
 
     # Get the unique indices of the stellar-kinematics bins
-    ubins, uindx = DAPFitsUtil.unique_bins(hdu['BINID'].data[1,:,:], return_index=True)
+    ubins, uindx = DAPFitsUtil.unique_bins(hdu['BINID'].data[1], return_index=True)
 
     # Get the x and y coordinates and the stellar velocities
-    x = hdu['BIN_LWSKYCOO'].data[0,:,:].ravel()[uindx]
-    y = hdu['BIN_LWSKYCOO'].data[1,:,:].ravel()[uindx]
+    x = hdu['BIN_LWSKYCOO'].data[0].ravel()[uindx]
+    y = hdu['BIN_LWSKYCOO'].data[1].ravel()[uindx]
     v = numpy.ma.MaskedArray(hdu['STELLAR_VEL'].data.ravel()[uindx],
                              mask=hdu['STELLAR_VEL_MASK'].data.ravel()[uindx] > 0)
 
@@ -641,3 +648,5 @@ measure stellar velocity.
              horizontalalignment='center', verticalalignment='center', transform=cax.transAxes)
 
     pyplot.show()
+
+
diff --git a/docs/include/links.rst b/docs/include/links.rst
index f892780a..70167a46 100644
--- a/docs/include/links.rst
+++ b/docs/include/links.rst
@@ -90,12 +90,16 @@
 .. _SDSS Bitmasks: http://www.sdss.org/dr16/algorithms/bitmasks/
 .. _Firefly VAC: https://www.sdss.org/dr16/manga/manga-data/manga-firefly-value-added-catalog/
 .. _Pipe3D VAC: https://www.sdss.org/dr16/manga/manga-data/manga-pipe3d-value-added-catalog/
+.. _MaNGA Bitmasks: https://www.sdss.org/dr16/manga/manga-data/metadata/#Bitmasks
 
-.. papers
+.. citations
 
 .. _Law et al. (2016, AJ, 152, 83): https://ui.adsabs.harvard.edu/abs/2016AJ....152...83L/abstract
 .. _Westfall et al. (2019, AJ, 158, 231): https://ui.adsabs.harvard.edu/abs/2019AJ....158..231W/abstract
 .. _Belfiore et al. (2019, AJ, 158, 160): https://ui.adsabs.harvard.edu/abs/2019AJ....158..160B/abstract
+.. _Maraston et al. (2020, MNRAS, 496, 2962): https://ui.adsabs.harvard.edu/abs/2020MNRAS.496.2962M/abstract
+.. _Law et al. (2021, AJ, 161, 52): https://ui.adsabs.harvard.edu/abs/2021AJ....161...52L/abstract
+.. _Cappellari & Copin (2003, MNRAS, 342, 345): https://ui.adsabs.harvard.edu/abs/2003MNRAS.342..345C/abstract
 
 .. mangadap github
 
@@ -104,23 +108,27 @@
 
 .. TRM
 
-.. _DRPall: https://trac.sdss.org/wiki/MANGA/TRM/TRM_MPL-10/metadata#DRP:DRPall
-.. _DRP datamodel: https://trac.sdss.org/wiki/MANGA/TRM/TRM_MPL-10/datamodel
-.. _DRP HDUCLASS: https://trac.sdss.org/wiki/MANGA/TRM/TRM_MPL-10/datamodel#HDUCLASS
-.. _DRP LOGCUBE: https://trac.sdss.org/wiki/MANGA/TRM/TRM_MPL-10/datamodel#manga-PLATE-IFUDESIGN-LOGCUBE.fits.gz
+.. _DRPall: https://trac.sdss.org/wiki/MANGA/TRM/TRM_MPL-11/metadata#DRP:DRPall
+.. _DRP datamodel: https://trac.sdss.org/wiki/MANGA/TRM/TRM_MPL-11/datamodel
+.. _DRP HDUCLASS: https://trac.sdss.org/wiki/MANGA/TRM/TRM_MPL-11/datamodel#HDUCLASS
+.. _DRP LOGCUBE: https://trac.sdss.org/wiki/MANGA/TRM/TRM_MPL-11/datamodel#manga-PLATE-IFUDESIGN-LOGCUBE.fits.gz
 
 .. SAS
 
 .. _DR15 SAS: https://dr15.sdss.org/sas/dr15/manga/spectro/analysis/v2_4_3/2.2.1/
 .. _MPL-10 SAS: https://data.sdss.org/sas/mangawork/manga/spectro/analysis/v3_0_1/3.0.1
+.. _MPL-11 SAS: https://data.sdss.org/sas/mangawork/manga/spectro/analysis/v3_1_1/3.1.0
 .. _MANGA_SPECTRO_ANALYSIS: https://data.sdss.org/sas/mangawork/manga/spectro/analysis
 .. _MANGA_SPECTRO_REDUX: https://data.sdss.org/sas/mangawork/manga/spectro/redux
 
 .. _MPL-9 error report: https://data.sdss.org/sas/mangawork/manga/spectro/analysis/v2_7_1/2.4.1/log/error_report.txt
 .. _MPL-10 error report: https://data.sdss.org/sas/mangawork/manga/spectro/analysis/v3_0_1/3.0.1/log/error_report.txt
+.. _MPL-11 error report: https://data.sdss.org/sas/mangawork/manga/spectro/analysis/v3_1_1/3.1.0/log/error_report.txt
 
 .. Example files
-.. _manga-8138-12704-MAPS-HYB10-MILESHC-MASTARHC2.fits.gz: https://data.sdss.org/sas/mangawork/manga/spectro/analysis/MPL-10/HYB10-MILESHC-MASTARHC2/8138/12704/manga-8138-12704-MAPS-HYB10-MILESHC-MASTARHC2.fits.gz
+
+.. _manga-8138-12704-MAPS-HYB10-MILESHC-MASTARSSP.fits.gz: https://data.sdss.org/sas/mangawork/manga/spectro/analysis/MPL-11/HYB10-MILESHC-MASTARSSP/8138/12704/manga-8138-12704-MAPS-HYB10-MILESHC-MASTARSSP.fits.gz
+.. _manga-8138-12704-LOGCUBE-HYB10-MILESHC-MASTARSSP.fits.gz: https://data.sdss.org/sas/mangawork/manga/spectro/analysis/MPL-11/HYB10-MILESHC-MASTARSSP/8138/12704/manga-8138-12704-LOGCUBE-HYB10-MILESHC-MASTARSSP.fits.gz
 
 .. marvin
 
diff --git a/docs/installation.rst b/docs/installation.rst
index 149da7d5..baa8541b 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -67,6 +67,14 @@ To install only the DAP dependencies, run:
 
     pip3 install -r requirements.txt
 
+To install the additional development (including the testing package
+``pytest``) and documentation dependencies, also run::
+
+.. code-block:: console
+
+    pip3 install -r requirements_doc.txt
+    pip3 install -r requirements_dev.txt
+
 
 Test your installation
 ----------------------
@@ -84,7 +92,7 @@ To test the installation, you can do one of the following:
     .. code-block:: console
 
         cd mangadap/tests
-        python3 -m pytest .
+        pytest .
 
 Some tests requires a set of "remote" data that are not located in
 the repo for space considerations. Downloading the data used by these
@@ -100,7 +108,7 @@ include usage of that data like this:
 
         python3 download_test_data.py
         cd mangadap/tests
-        python3 -m pytest .
+        pytest .
 
 
 Local Environment Setup
@@ -115,7 +123,7 @@ below.
 +----------------------------+-------------------------------------+------------------------------------------------+
 |                   Variable |                             Default |                                       Comments |
 +============================+=====================================+================================================+
-| ``MANGADRP_VER``           | ``v3_0_1`` (i.e., MPL-10)           | Version of the DRP, used for path construction |
+| ``MANGADRP_VER``           | ``v3_1_1`` (i.e., MPL-11)           | Version of the DRP, used for path construction |
 +----------------------------+-------------------------------------+------------------------------------------------+
 | ``MANGA_SPECTRO_REDUX``    | ``$HOME/MaNGA/redux``               | Root path for the reduced data                 |
 +----------------------------+-------------------------------------+------------------------------------------------+
@@ -132,10 +140,10 @@ that is sourced when you want to run the DAP.  The lines added to your
 .. code-block:: bash
 
     export MANGA_SPECTRO_REDUX=/Volumes/MaNGA/redux
-    export MANGADRP_VER=v3_0_1
+    export MANGADRP_VER=v3_1_1
 
     export MANGA_SPECTRO_ANALYSIS=/Volumes/MaNGA/analysis
-    export MANGADAP_VER=3.0.1
+    export MANGADAP_VER=3.1.0
 
 .. note::
 
diff --git a/docs/knownissues.rst b/docs/knownissues.rst
index 628d91cd..267bffbe 100644
--- a/docs/knownissues.rst
+++ b/docs/knownissues.rst
@@ -11,13 +11,13 @@ Persistent
 LSF limitations
 ---------------
 
-The DRP provides both pre- and post-pixelized Gaussian measurements
-of the instrumental line-spread function. Because it makes the most
-sense to use the pre-pixelized versions with pPXF, the DAP uses these
-pre-pixelized measurements for the dispersion calculations in both
-the stellar and ionized-gas velocity dispersions. A more in-depth
-analysis is ongoing to understand how these LSF changes affect the
-results (Law et al. 2020).
+The DRP provides both pre- and post-pixelized Gaussian measurements of the
+instrumental line-spread function. Because it makes the most sense to use the
+pre-pixelized versions with pPXF, the DAP uses these pre-pixelized
+measurements for the dispersion calculations in both the stellar and
+ionized-gas velocity dispersions. See `Law et al. (2021, AJ, 161, 52)`_ for
+an in-depth analysis of the affects of the LSF measurements on the stellar
+and ionized-gas velocity dispersions.
 
 Artifact effects on emission-line fitting
 -----------------------------------------
@@ -41,35 +41,93 @@ measured using the input (NSA) redshift, *not* the fitted stellar
 velocity.  Specifically for the velocity-dispersion corrections, this
 means that there will be a *velocity* dependence of the correction that
 can be more significant that the correction for the velocity dispersion
-itself.  The approach to the velocity dispersion corrections may be
-improved in future releases.
+itself.
 
 Flagging
 --------
 
-There are still severe deficiencies in the flagging, in general.
-Measurements can exhibit pixel-to-pixel variations that are inconsistent
-with random error (because of the strong covariance between neighboring
-spaxels) or fiber-level deviations that are inconsistent with physical
-intuition.  These issues tend to occur at low S/N, however, they might
-not all be caught by a simple S/N cut.  **Please consider the limited
-robustness of the flagging for your science goals.**  These limitations
-apply to essentially all derived products (kinematics, fluxes, indices,
-etc).
+There are still deficiencies in flagging, in general. Measurements can
+exhibit pixel-to-pixel variations that are inconsistent with random error
+(because of the strong covariance between neighboring spaxels) or fiber-level
+deviations that are inconsistent with physical intuition. These issues tend
+to occur at low S/N, however, they might not all be caught by a simple S/N
+cut. **Please consider the limited robustness of the flagging for your
+science goals.** These limitations apply to essentially all derived products
+(kinematics, fluxes, indices, etc).
 
 Uncertainties
 -------------
 
-Errors are generally "formal" errors determined either by the
-covariance (inverse Hessian) matrix provided by the optimization
-algorithm (stellar and emission-line kinematics) or a direct
-propagation of the error based on the inverse variances provided by
-the DRP (as for the emission-line moments and spectral indices).
-Idealized experiments and analysis of repeat observations have shown
-that the formal errors are within a factor of two of the statistical
-error. See the detailed assessments of the DAP uncertainties in the
-two main DAP papers: `Westfall et al. (2019, AJ, 158, 231)`_ and
-`Belfiore et al. (2019, AJ, 158, 160)`_.
+Errors are generally "formal" errors determined either by the covariance
+(inverse Hessian) matrix provided by the optimization algorithm (stellar and
+emission-line kinematics; `ppxf`_) or a direct propagation of the error based
+on the inverse variances provided by the DRP (as for the emission-line
+moments and spectral indices). Idealized experiments and analysis of repeat
+observations have shown that the formal errors are generally within a factor
+of two of the statistical error. See the detailed assessments of the DAP
+uncertainties in the two main DAP papers: `Westfall et al. (2019, AJ, 158,
+231)`_ and `Belfiore et al. (2019, AJ, 158, 160)`_.
+
+MPL-11 (3.1.0)
+==============
+
+Faults
+------
+
+The full report of the observations that faulted and the consolidated
+list of error messages can be found in the `MPL-11 error report`_
+(internal).
+
+In total, there are 11273 DRP-produced data cubes. Of these, 491 did
+not have an input redshift, and were therefore not analyzed by the
+DAP; most (if not all) of these are the result of allocating bundles
+to empty sky for special observations (such as the mosaic of IC342).
+
+Of the 10782 cubes that the DAP attempted to analyze, 47 caused
+faults during the analysis. These failures are mostly because the S/N
+required for either the stellar kinematics or emission-line fit was
+insufficient for *any* spectrum in the datacube. Of these, two cubes
+successfully finished the ``SPX-MILESHC-MASTARSSP`` analysis, but
+were unsuccessful for the other three types. Here are the
+number of completed ``MAPS`` files for each ``DAPTYPE``:
+
++-----------------------------+-----------------------+
+|                 ``DAPTYPE`` | :math:`N_{\rm cubes}` |
++=============================+=======================+
+|  ``SPX-MILESHC-MASTARSSP``  |                 10737 |
++-----------------------------+-----------------------+
+| ``VOR10-MILESHC-MASTARSSP`` |                 10735 |
++-----------------------------+-----------------------+
+| ``HYB10-MILESHC-MASTARSSP`` |                 10735 |
++-----------------------------+-----------------------+
+| ``HYB10-MILESHC-MASTARHC2`` |                 10735 |
++-----------------------------+-----------------------+
+
+The 41 cubes that failed all ``DAPTYPEs`` are::
+
+    8312-6101, 8479-6101, 8479-6102, 8479-12703, 8480-6102, 8480-12703,
+    8587-12701, 8587-12702, 8626-9102, 8953-6104, 9051-3704, 9051-6104,
+    9051-12704, 9673-1901, 9673-1902, 9673-3701, 9673-3702, 9673-3703,
+    9673-3704, 9673-6101, 9673-6103, 9673-6104, 9674-1901, 9674-1902,
+    9674-3701, 9674-3702, 9674-3703, 9674-3704, 9674-6101, 9674-6104,
+    9675-1901, 9675-1902, 9675-3701, 9675-3702, 9675-3703, 9675-3704,
+    9675-6101, 9675-6103, 9675-6104, 11828-1902, 11939-1901, 11949-1901,
+    11950-6102, 11987-1901, 11987-6104
+
+The cubes that passed ``SPX-MILESHC-MASTARSSP``, but failed the other two is::
+
+    8158-3703, 8953-9102
+
+Emission-line fluxes
+--------------------
+
+Not an "issue" necessarily, but the same warning from MPL-10 holds regarding
+differences in the emission-line fluxes between MPL-10 and MPL-11 due to the
+change in the spectra used to fit the underlying stellar continuum. Users are
+encouraged to compare the results from ``HYB10-MILESHC-MASTARHC2`` and
+``HYB10-MILESHC-MASTARSSP`` to assess the systematic errors in, e.g., the
+emission-line equivalent-width measurements driven by the continuum fits.
+
 
 MPL-10 (3.0.1)
 ==============
diff --git a/docs/metadatamodel.rst b/docs/metadatamodel.rst
index 731266c6..efc36245 100644
--- a/docs/metadatamodel.rst
+++ b/docs/metadatamodel.rst
@@ -294,11 +294,11 @@ the table extension has the following columns:
     * ``OBJRA`` and ``OBJDEC`` are not necessarily located at the center
       of the IFU field of view.  The IFU center coordinates are provided
       in the `DRPall`_ file as ``IFURA`` and ``IFUDEC``.
-    * The MaNGA ID is defined as ``[CATID]-[CATINDX]`` (**link**)
+    * The MaNGA ID is defined as ``[CATID]-[CATINDX]``
     * For the main survey galaxies, ``TRG_VERSION`` and ``TRG_ID`` are
       drawn from the NASA-Sloan atlas and are identical to
-      'nsa_nsa_version' and 'nsa_nsaid' in the DRPall file (**link**).
-    * The targeting bits are defined (**link**).
+      'nsa_nsa_version' and 'nsa_nsaid' in the `DRPall`_ file.
+    * The MaNGA targeting bits; see `MaNGA Bitmasks`_.
     * The redshifts from the NSA and ancillary-program catalogs are
       consolidated into the 'z' column in the DRPall file.  See
       discussion of the "redshift fix file" below.
@@ -422,7 +422,7 @@ DAPall database
 The DAPall file has an empty primary extension and then one extension
 for each ``DAPTYPE`` performed by a given analysis plan. The name of
 the extension is identically the ``DAPTYPE`` and it contains one row
-per analyzed datacube. For example, in MPL-10, the list of extensions
+per analyzed datacube. For example, in MPL-11, the list of extensions
 in the DAPall file are:
 
 +-----------+-----------------------------+
@@ -430,11 +430,13 @@ in the DAPall file are:
 +===========+=============================+
 |         0 | ``PRIMARY``                 |
 +-----------+-----------------------------+
-|         1 | ``SPX-MILESHC-MASTARHC2``   |
+|         1 | ``SPX-MILESHC-MASTARSSP``   |
 +-----------+-----------------------------+
-|         2 | ``VOR10-MILESHC-MASTARHC2`` |
+|         2 | ``VOR10-MILESHC-MASTARSSP`` |
 +-----------+-----------------------------+
-|         3 | ``HYB10-MILESHC-MASTARHC2`` |
+|         3 | ``HYB10-MILESHC-MASTARSSP`` |
++-----------+-----------------------------+
+|         4 | ``HYB10-MILESHC-MASTARHC2`` |
 +-----------+-----------------------------+
 
 Header data
@@ -492,7 +494,7 @@ Each subsequent extension, named after the :ref:`datamodel-daptype`
 +----------------------------+-----------------+----------------------------------------------------+-------------------------------------------------------------------------------+
 |                   ``MODE`` |             str |                                                    | 3D mode of the DRP file (``CUBE`` or ``RSS``)                                 |
 +----------------------------+-----------------+----------------------------------------------------+-------------------------------------------------------------------------------+
-|                ``DAPTYPE`` |             str |                                                    | Keyword of the analysis approach used (e.g., ``SPX-MILESHC-MASTARHC2``)       |
+|                ``DAPTYPE`` |             str |                                                    | Keyword of the analysis approach used (e.g., ``SPX-MILESHC-MASTARSSP``)       |
 +----------------------------+-----------------+----------------------------------------------------+-------------------------------------------------------------------------------+
 |                ``DAPDONE`` |            bool |                                                    | Flag that MAPS file successfully produced                                     |
 +----------------------------+-----------------+----------------------------------------------------+-------------------------------------------------------------------------------+
@@ -504,11 +506,11 @@ Each subsequent extension, named after the :ref:`datamodel-daptype`
 +----------------------------+-----------------+----------------------------------------------------+-------------------------------------------------------------------------------+
 |                 ``IFUDEC`` |          double |                                                deg | Declination of the IFU pointing center (generally the same as  ``OBJDEC``)    |
 +----------------------------+-----------------+----------------------------------------------------+-------------------------------------------------------------------------------+
-|               ``MNGTARG1`` |             int |                                                    | Main survey targeting bit (**link**)                                          |
+|               ``MNGTARG1`` |             int |                                                    | Main survey targeting bit (see ``MANGA_TARGET1`` in `MaNGA Bitmasks`_)        |
 +----------------------------+-----------------+----------------------------------------------------+-------------------------------------------------------------------------------+
-|               ``MNGTARG2`` |             int |                                                    | Non-galaxy targeting bit (**link**)                                           |
+|               ``MNGTARG2`` |             int |                                                    | Non-galaxy targeting bit (see ``MANGA_TARGET2`` in `MaNGA Bitmasks`_)         |
 +----------------------------+-----------------+----------------------------------------------------+-------------------------------------------------------------------------------+
-|               ``MNGTARG3`` |             int |                                                    | Ancillary targeting bit (**link**)                                            |
+|               ``MNGTARG3`` |             int |                                                    | Ancillary targeting bit (see ``MANGA_TARGET3`` in `MaNGA Bitmasks`_)          |
 +----------------------------+-----------------+----------------------------------------------------+-------------------------------------------------------------------------------+
 |                      ``Z`` |          double |                                                    | Redshift used for initial guess velocity (typically identical to ``NSA_Z``)   |
 +----------------------------+-----------------+----------------------------------------------------+-------------------------------------------------------------------------------+
@@ -556,9 +558,9 @@ Each subsequent extension, named after the :ref:`datamodel-daptype`
 +----------------------------+-----------------+----------------------------------------------------+-------------------------------------------------------------------------------+
 |                ``VERSDAP`` |             str |                                                    | Version of mangadap                                                           |
 +----------------------------+-----------------+----------------------------------------------------+-------------------------------------------------------------------------------+
-|               ``DRP3QUAL`` |             str |                                                    | DRP 3D quality bit (**link**)                                                 |
+|               ``DRP3QUAL`` |             str |                                                    | DRP 3D quality bit (see :ref:`metadatamodel-drp3qual`)                        |
 +----------------------------+-----------------+----------------------------------------------------+-------------------------------------------------------------------------------+
-|                ``DAPQUAL`` |             str |                                                    | DAP quality bit (**link**)                                                    |
+|                ``DAPQUAL`` |             str |                                                    | DAP quality bit (see :ref:`metadatamodel-dapqual`)                            |
 +----------------------------+-----------------+----------------------------------------------------+-------------------------------------------------------------------------------+
 |  **DAP analysis flow information**                                                                                                                                                |
 +----------------------------+-----------------+----------------------------------------------------+-------------------------------------------------------------------------------+
diff --git a/docs/tables/drpquality3dbitmask.rst b/docs/tables/drpquality3dbitmask.rst
index a5ead430..3055225c 100644
--- a/docs/tables/drpquality3dbitmask.rst
+++ b/docs/tables/drpquality3dbitmask.rst
@@ -1,21 +1,23 @@
 Class Instantiation: :class:`mangadap.util.drpfits.DRPQuality3DBitMask`
 
-===========  ===  =================================================
-Key          Bit  Description                                      
-===========  ===  =================================================
-RETIRED      0    Bit retired from use                             
-BADDEPTH     1    IFU does not reach target depth                  
-SKYSUBBAD    2    Bad sky subtraction in one or more frames        
-HIGHSCAT     3    High scattered light in one or more frames       
-BADASTROM    4    Bad astrometry in one or more frames             
-VARIABLELSF  5    LSF varies signif. between component spectra     
-BADOMEGA     6    Omega greater than threshhold in one or more sets
-BADSET       7    One or more sets are bad                         
-BADFLUX      8    Bad flux calibration                             
-BADPSF       9    PSF estimate may be bad                          
-MANYDEAD     10   Many dead fibers                                 
-RETIRED2     11   Bit retired, moved into MASTAR_QUAL instead      
-BLOWTORCH    12   Blowtorch artifact in one or more frames         
-CRITICAL     30   Critical failure in one or more frames           
-===========  ===  =================================================
+===========  ===  ===========================================================
+Key          Bit  Description                                                
+===========  ===  ===========================================================
+RETIRED      0    Bit retired from use                                       
+BADDEPTH     1    IFU does not reach target depth                            
+SKYSUBBAD    2    Bad sky subtraction in one or more frames                  
+HIGHSCAT     3    High scattered light in one or more frames                 
+BADASTROM    4    Bad astrometry in one or more frames                       
+VARIABLELSF  5    LSF varies signif. between component spectra               
+BADOMEGA     6    Omega greater than threshhold in one or more sets          
+BADSET       7    One or more sets are bad                                   
+BADFLUX      8    Bad flux calibration                                       
+BADPSF       9    PSF estimate may be bad                                    
+MANYDEAD     10   Many dead fibers                                           
+RETIRED2     11   Bit retired, moved into MASTAR_QUAL instead                
+BLOWTORCH    12   Blowtorch artifact in one or more frames                   
+SEVEREBT     13   Severe blowtorch artifact                                  
+UNUSUAL      14   Cube slightly unusual in some way but good for most science
+CRITICAL     30   Critical failure in one or more frames                     
+===========  ===  ===========================================================
 
diff --git a/docs/templatelibraries.rst b/docs/templatelibraries.rst
index af9b9cc3..3ce646e9 100644
--- a/docs/templatelibraries.rst
+++ b/docs/templatelibraries.rst
@@ -41,6 +41,8 @@ The following spectral template libraries are included with the DAP distribution
 +-----------------+------------+---------+-------------+-------------------------------------------------------------------------------------------------------------------+
 | MASTARHC2       |       [5]_ | Stellar |   Empirical | `README <https://github.com/sdss/mangadap/blob/master/mangadap/data/spectral_templates/mastarhc_v2/README>`__     |
 +-----------------+------------+---------+-------------+-------------------------------------------------------------------------------------------------------------------+
+| MASTARSSP       |      [10]_ |     SPS |   Empirical | `README <https://github.com/sdss/mangadap/blob/master/mangadap/data/spectral_templates/mastar_ssp_v1.0/README>`__ |
++-----------------+------------+---------+-------------+-------------------------------------------------------------------------------------------------------------------+
 | MILES           |       [6]_ | Stellar |   Empirical | `README <https://github.com/sdss/mangadap/blob/master/mangadap/data/spectral_templates/miles/README>`__           |
 +-----------------+------------+---------+-------------+-------------------------------------------------------------------------------------------------------------------+
 | MILESAVG        |       [6]_ | Stellar |   Empirical | `README <https://github.com/sdss/mangadap/blob/master/mangadap/data/spectral_templates/miles_avg/README>`__       |
@@ -162,5 +164,5 @@ the TemplateLibrary :ref:`templatelibrary-usage` and the
 .. [7] `Westfall et al. (2019, AJ, 158, 231) <https://ui.adsabs.harvard.edu/abs/2019AJ....158..231W/abstract>`_
 .. [8] `Vazdekis et al. (2012, MNRAS, 424, 157) <https://ui.adsabs.harvard.edu/abs/2012MNRAS.424..157V/abstract>`_
 .. [9] `Le Borgne et al. (2003, A&A, 402, 433) <https://ui.adsabs.harvard.edu/abs/2003A%26A...402..433L/abstract>`_
-
+.. [10] `Maraston et al. (2020, MNRAS, 496, 2962)`_
 
diff --git a/docs/whatsnew.rst b/docs/whatsnew.rst
index b1828ba5..2cad24f7 100644
--- a/docs/whatsnew.rst
+++ b/docs/whatsnew.rst
@@ -5,6 +5,87 @@
 What's New in the DAP
 *********************
 
+MPL-11 (3.1.0)
+==============
+
+High-level changes
+------------------
+
+ * Most analysis approaches (``DAPTYPE``) now use a set of MaStar Simple
+   Stellar Population models as the continuum for the emission-line fitting
+   module. The models have been published by `Maraston et al. (2020, MNRAS,
+   496, 2962)`_; see also https://www.icg.port.ac.uk/MaStar/. The models used
+   are a subset of the full model library, which spans the full range of
+   parameter space of the full library but enables a faster execution time.
+   The weighting of the different models is **not** constrained to be smooth
+   or to match any parametric star-formation/chemical-enrichment history. The
+   models included in the fit have the following grid of physical
+   parameters::
+
+        Age [Gyr]:    0.00316228, 0.01, 0.03162278, 0.100, 0.300, 1.000, 3.000, 9.000, 14.000
+        log(Z/Z_sun): -1.35, -1., -0.7, -0.33, 0, 0.35
+        IMF Slope:    2.35 (Salpeter)
+
+ * The MPL-11 results include the usual 3 binning schemes used with the
+   MaStar SSP templates, as well as a fourth ``DAPTYPE`` that uses the same
+   hierarchically clustered MaStar templates from the MPL-10 release. This
+   fourth analysis approach provides a useful baseline for assessing the
+   effects of the change in the continuum on the emission-line results; i.e.,
+   all differences in the analysis results between the
+   ``HYB10-MILESHC-MASTARSSP`` and ``HYB10-MILESHC-MASTARHC2`` results should
+   be driven by the difference in the continuum templates used in the
+   emission-line fitting module.
+
+User-level changes/bug fixes
+----------------------------
+
+ * A bug in the reconstruction of the model spectra, **after** the model had
+   been fit, meant that some regions that were masked were incorrectly
+   reconstructed. This did not affect the parameters in the MAPS files or the
+   emission-line-only or stellar-continuum-only spectra. This has now been
+   fixed.
+ * Significant revision to the format of the input files used to provide the
+   list of emission-lines to fit. This change primarily enables the DAP to
+   automatically construct the matrices used by `ppxf`_ to constrain the
+   kinematics of different kinematic components. This functionality was used
+   to test the results of tying the dispersion of emission lines to, say, all
+   be within a factor of 2 of the H-alpha velocity dispersion. In the end,
+   these constraints **were not** implemented in this MPL; the tying strategy
+   for MPL-11 is identical to MPL-10.
+ * The rest wavelengths of a number of emission lines have been updated to
+   better account for the affects of fine-structure blending. For example,
+   the rest wavelength (in vacuum) of the H-alpha line was 6564.632 angstrom
+   in MPL-10, but it is 6564.608 in MPL-11. This is representative of the
+   wavelength changes; i.e., the differences are typically a few hundredths
+   of an angstrom. This change should have a very limited effect on the
+   emission-line measurements.
+
+Under-the-hood changes/bug fixes
+--------------------------------
+
+ * Added the :class:`~mangadap.util.datatable.DataTable` class to handle the
+   binary tables in the reference files, mostly to enable a uniform data model
+   and enable automated documentation.
+ * Enabled fitting a restricted wavelength range in the emission-line
+   module.
+ * Add parameter to change the required fraction of spectral coverage to
+   perform a fit.
+ * Detailed handling of masks for binning, MW extinction correction, and
+   emission-line continuum construction.
+ * Enable the output grid for :class:`~mangadap.util.sampling.Resample`
+   to be defined directly.
+ * Include covariance calculation in
+   :class:`~mangadap.util.sampling.Resample`.
+ * Add a class that reads trace sets produced by IDLUTILS,
+   :class:`~mangadap.util.trace.TraceSet`, but not well tested yet.
+ * Fix untested velocity registration and stacking code, and added
+   registration test.
+ * Upgraded package requirements
+ * Line profile in
+   :class:`~mangadap.proc.emissionlinetempltes.EmissionLineTemplates` now
+   hardwired to be
+   :class:`~mangadap.util.lineprofiles.FFTGaussianLSF`.
+
 MPL-10 (3.0.1)
 ==============
 
diff --git a/mangadap/__init__.py b/mangadap/__init__.py
index a30e65bf..118d18d0 100644
--- a/mangadap/__init__.py
+++ b/mangadap/__init__.py
@@ -1,5 +1,5 @@
 
-__version__ = '3.1.0'
+__version__ = '3.1.1dev'
 __license__ = 'BSD3'
 __author__ = 'Kyle B. Westfall'
 __maintainer__ = 'Kyle B. Westfall'
@@ -23,8 +23,8 @@ def short_warning(message, category, filename, lineno, file=None, line=None):
 import warnings
 warnings.formatwarning = short_warning
 
-_MANGADRP_VER = 'v3_0_1'
-_MANGACORE_VER = 'v1_8_1'
+_MANGADRP_VER = 'v3_1_1'
+_MANGACORE_VER = 'v1_9_1'
 
 # WARNING: This has to be kept in sync with setup.py
 # TODO: Put these in a config file
diff --git a/mangadap/data/sdss/sdssMaskbits.par b/mangadap/data/sdss/sdssMaskbits.par
index 89a0ed9e..ee071a66 100644
--- a/mangadap/data/sdss/sdssMaskbits.par
+++ b/mangadap/data/sdss/sdssMaskbits.par
@@ -1012,7 +1012,8 @@ maskbits MANGA_DRP2QUAL 15 NOGUIDER " No guider data available"
 maskbits MANGA_DRP2QUAL 16 NOSPEC1 " No data from spec1"
 maskbits MANGA_DRP2QUAL 17 NOSPEC2 " No data from spec2"
 maskbits MANGA_DRP2QUAL 18 BLOWTORCH " Blowtorch artifact detected"
-maskbits MANGA_DRP2QUAL 19 BLOWTORCHFAIL " Blowtorch artifact severe and uncorrectable"
+maskbits MANGA_DRP2QUAL 19 RETIRED2 " Bit retired from use"
+maskbits MANGA_DRP2QUAL 20 SEVEREBT " Severe blowtorch artifact"
 
 # DRP-3d quality flag bitmask
 masktype MANGA_DRP3QUAL 64 "Mask bits for MaNGA DRP-3d quality flags"
@@ -1029,6 +1030,8 @@ maskbits MANGA_DRP3QUAL  9 BADPSF " PSF estimate may be bad"
 maskbits MANGA_DRP3QUAL 10 MANYDEAD " Many dead fibers"
 maskbits MANGA_DRP3QUAL 11 RETIRED2 " Bit retired, moved into MASTAR_QUAL instead"
 maskbits MANGA_DRP3QUAL 12 BLOWTORCH " Blowtorch artifact in one or more frames"
+maskbits MANGA_DRP3QUAL 13 SEVEREBT " Severe blowtorch artifact"
+maskbits MANGA_DRP3QUAL 14 UNUSUAL " Cube slightly unusual in some way but good for most science"
 maskbits MANGA_DRP3QUAL 30 CRITICAL " Critical failure in one or more frames"
 
 # MaStar quality flag bitmask
@@ -1037,7 +1040,7 @@ maskbits MASTAR_QUAL  0 NODATA " No Data"
 maskbits MASTAR_QUAL  1 SKYSUBBAD " Bad sky subtraction in one or more frames"
 maskbits MASTAR_QUAL  2 HIGHSCAT " High scattered light in one or more frames"
 maskbits MASTAR_QUAL  3 BADFLUX " Bad flux calibration"
-maskbits MASTAR_QUAL  4 LOWCOV " PSF-covering fraction by fiber is too small (<10%)"
+maskbits MASTAR_QUAL  4 LOWCOV " PSF-covering fraction by fiber is too small (<5%)"
 maskbits MASTAR_QUAL  5 POORCAL " Poor throughput"
 maskbits MASTAR_QUAL  6 BADHELIORV " High variance between stellar RVs"
 maskbits MASTAR_QUAL  7 MANUAL " Flagged as problematic by visual inspection"
@@ -1045,6 +1048,11 @@ maskbits MASTAR_QUAL  8 EMLINE " Spectrum contain emission lines"
 maskbits MASTAR_QUAL  9 LOWSN  " Per-MJD Spectrum has median S/N <= 15"
 maskbits MASTAR_QUAL 10 MULTIFIBER " Composite spectrum combined from multiple fibers"
 maskbits MASTAR_QUAL 11 BLOWTORCH " Blowtorch artifact in one or more frames"
+maskbits MASTAR_QUAL 12 SEVEREBT " Severe blowtorch artifact"
+maskbits MASTAR_QUAL 13 UPTURNRISK " Risk of having a red-upturn"   
+maskbits MASTAR_QUAL 14 REDUPTURN " Red-upturn identified by visual inspection"
+maskbits MASTAR_QUAL 15 REDDOWNTURN " Red-downturn identified by visual inspection"
+maskbits MASTAR_QUAL 16 NONSTELLAR " Non-stellar spectrum based on visual inspection"
 maskbits MASTAR_QUAL 30 CRITICAL " Critical failure in one or more frames"
 
 # The following mask bits are for the 2D MANGA pipeline
diff --git a/setup.py b/setup.py
index b38cf877..9ffcefad 100755
--- a/setup.py
+++ b/setup.py
@@ -13,11 +13,11 @@
 import requests
 import warnings
 
-_IDLUTILS_VER = 'v5_5_35'
-_MANGADRP_VER = 'v3_0_1'
-_MANGACORE_VER = 'v1_8_1'
+_IDLUTILS_VER = 'v5_5_36'
+_MANGADRP_VER = 'v3_1_1'
+_MANGACORE_VER = 'v1_9_1'
 
-_VERSION = '3.1.0'
+_VERSION = '3.1.1dev'
 _RELEASE = 'dev' not in _VERSION
 _MINIMUM_PYTHON_VERSION = '3.7'
 


Test patch:
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
new file mode 100644
index 00000000..22312677
--- /dev/null
+++ b/.github/workflows/ci_tests.yml
@@ -0,0 +1,68 @@
+# Adapted from pypeit/.github/workflows/ci_tests.yml
+
+name: CI Tests
+
+on:
+  push:
+    branches: [ master ]
+    tags:
+  pull_request:
+    branches: [ master ]
+
+env:
+  SETUP_XVFB: True  # avoid issues if mpl tries to open a GUI window
+
+jobs:
+  ci-tests:
+    name: Python-${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
+    if: "!(contains(github.event.head_commit.message, '[skip ci]') || contains(github.event.head_commit.message, '[ci skip]'))"
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        python-version: [3.7, 3.8, 3.9]
+
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install development dependencies
+      run: |
+        python -m pip install --upgrade pip wheel
+        python -m pip install -r requirements_dev.txt
+        python -m pip install -e .
+    - name: Print critical environment versions
+      run: |
+        python -c "import sys; print(f'Python {sys.version}')"
+        python -c "import pip; print(f'pip {pip.__version__}')"
+        python -c "import setuptools; print(f'setuptools {setuptools.__version__}')"
+        python -c "import numpy; print(f'numpy {numpy.__version__}')"
+        python -c "import scipy; print(f'scipy {scipy.__version__}')"
+        python -c "import astropy; print(f'astropy {astropy.__version__}')"
+    - name: Run tests
+      run: |
+        pytest
+
+  codestyle:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    steps:
+    - uses: actions/checkout@v2
+    - name: Python codestyle check
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install pycodestyle
+    - name: Check for runtime errors using pycodestyle
+      run: |
+        pycodestyle mangadap --count --select=E9
+
+
+
diff --git a/pytest.ini b/pytest.ini
index b84cb026..6d639696 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,3 @@
 [pytest]
-testpaths=python/mangadap/tests
+testpaths=mangadap/tests