Merge pull request #12 from tomasstolker/correlated

Merging FitPlanck in FitModel, support for calibration parameters, reading subsets of object data
tomasstolker · May 12, 2020 · 3e265a1 · 3e265a1
2 parents 9309555 + 0e00876
commit 3e265a1
Show file tree

Hide file tree

Showing 34 changed files with 1,183 additions and 1,164 deletions.
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,3 +1,3 @@
-nbsphinx ~= 0.6
+nbsphinx ~= 0.7
 pandoc ~= 1.0
 jupyter ~= 1.0
diff --git a/docs/species.analysis.rst b/docs/species.analysis.rst
@@ -12,14 +12,6 @@ species.analysis.fit\_model module
    :undoc-members:
    :show-inheritance:
 
-species.analysis.fit\_planck module
------------------------------------
-
-.. automodule:: species.analysis.fit_planck
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 species.analysis.fit\_spectrum module
 -------------------------------------
 

diff --git a/docs/tutorials.rst b/docs/tutorials.rst
@@ -19,4 +19,9 @@ This page contains a list of tutorials which highlight some of the functionaliti
    tutorials/fitting_model_spectra.ipynb
 
 .. important::
-   A flux calibrated spectrum of Vega is used for the conversion between flux density and magnitude. The magnitude of Vega is set to 0.03 mag for all filters (see also `Stolker et al. 2020 <https://ui.adsabs.harvard.edu/abs/2019arXiv191213316S>`_).
+   A flux calibrated spectrum of Vega is used for the conversion between a flux density and magnitude. The magnitude of Vega is set to 0.03 mag for all filters. If needed, the magnitude of Vega can be changed with the ``vega_mag`` attribute of ``SyntheticPhotometry``:
+
+   .. code-block:: python
+
+       >>> synphot = species.SyntheticPhotometry('MKO/NSFCam.K')
+       >>> synphot.vega_mag = 0.01
diff --git a/requirements.txt b/requirements.txt
@@ -5,7 +5,7 @@ emcee ~= 3.0
 h5py ~= 2.10
 matplotlib ~= 3.2
 numpy ~= 1.18
-pandas ~= 0.25
+pandas ~= 1.0
 PyMieScatt ~= 1.7
 pymultinest ~= 2.9
 scipy ~= 1.4

diff --git a/species/__init__.py b/species/__init__.py
@@ -1,7 +1,5 @@
 from species.analysis.fit_model import FitModel
 
-from species.analysis.fit_planck import FitPlanck
-
 from species.analysis.fit_spectrum import FitSpectrum
 
 from species.analysis.photometry import SyntheticPhotometry