Merge pull request #24 from natashabatalha/dev

Dev
natashabatalha · Nov 2, 2020 · fa65d30 · fa65d30
2 parents 0737df3 + 4f16774
commit fa65d30
Show file tree

Hide file tree

Showing 23 changed files with 457,758 additions and 3,872 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,5 @@ dist/
 
 # Mac files
 *.DS_Store
+
+*__pycache__/
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,14 @@
 History
 -------
 
+2.1 (2020-11-02)
+~~~~~~~~~~~~~~~~~~
+
+* Transit Spectroscopy added 
+* Transit spectroscopy tutorial 
+* FAQ notebook 
+* Minor bug fixes/improvements
+
 2.0.1 (2020-07-21)
 ~~~~~~~~~~~~~~~~~~
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -65,9 +65,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.0'
+version = '2.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.0'
+release = '2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/index.rst b/docs/index.rst
@@ -12,24 +12,15 @@
    </div>
    <br/><br/>
 
-``picaso`` enables the computation of reflected light spectroscopy. Check out the use cases below to determine if ``picaso`` is the right tool for your science.
+``picaso`` enables the computation of exoplanet and brown dwarf spectroscopy in transmission, emission or reflected light. Check out the use cases below to determine if ``picaso`` is the right tool for your science.
 
-Use Cases
-=========
+Just a Few Example Use Cases
+============================
 
 .. raw:: html 
 
    <div align="center">
-   <img src="_images/planettype.png" width="300px">
-   </img>
-   <img src="_images/refem.png" width="300px">
-   </img>
-   <br/>
-   </div>
-   <br/><br/>
-
-   <div align="center">
-   <img src="_images/multiphase.png" width="600px">
+   <img src="_images/usecases.png" width="700px">
    </img>
    <br/>
    </div>

diff --git a/docs/notebooks/1_GetStarted.ipynb b/docs/notebooks/1_GetStarted.ipynb
diff --git a/docs/notebooks/5_AddingTransitSpectrum.ipynb b/docs/notebooks/5_AddingTransitSpectrum.ipynb
diff --git a/docs/notebooks/FAQs.ipynb b/docs/notebooks/FAQs.ipynb
diff --git a/docs/tutorials.rst b/docs/tutorials.rst
@@ -1,8 +1,8 @@
 Tutorials
 =========
 
-Basics Reflected Light
-----------------------
+Basics of Reflected Light
+-------------------------
 
 .. toctree::
    :maxdepth: 2
@@ -12,6 +12,13 @@ Basics Reflected Light
    Adding Surface Reflectivity </notebooks/3_AddingSurfaceReflectivity.ipynb>
    Plot Diagnostics </notebooks/4_PlotDiagnostics.ipynb>
 
+Basics of Transmisison
+----------------------
+
+.. toctree::
+   :maxdepth: 2
+
+   Transmission Spectroscopy Exoplanets </notebooks/5_AddingTransitSpectrum.ipynb>
 
 Basics of Thermal Emission
 --------------------------
@@ -48,11 +55,10 @@ Opacities & Approximatons
    Investigating Approximations  </notebooks/10_AnalyzingApproximations.ipynb>
    SQLITE Tutorial </notebooks/11_Sqlite3Tutorial.ipynb>
 
-
-Retrievals (tutorials coming soon)
-----------------------------------
+Miscellaneous
+-------------
 
 .. toctree::
    :maxdepth: 2
 
-   Retrievals </notebooks/9_Retrievals.ipynb>
+   FAQs </notebooks/FAQs.ipynb>
diff --git a/docs/usecases.png b/docs/usecases.png
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,5 @@ dist/

		# Mac files
		*.DS_Store

		*__pycache__/