Merge bb10004 into c1a331b

tardis-sn · Apr 30, 2014 · 8cc676e · 8cc676e
2 parents c1a331b + bb10004
commit 8cc676e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -52,9 +52,11 @@
 source_suffix = '.rst'
 ## get's rid of many toctree contains errors: see https://github.com/phn/pytpm/issues/3#issuecomment-12133978
 numpydoc_show_class_members = False
-extensions += ['matplotlib.sphinxext.plot_directive']
+extensions += ['matplotlib.sphinxext.plot_directive',
+               'sphinxcontrib.bibtex',
+               'sphinxcontrib.tikz']
+
 
-extensions.append('sphinxcontrib.bibtex')
 
 # -- General configuration ----------------------------------------------------
 

diff --git a/docs/graphics/d_inner.ggb b/docs/graphics/d_inner.ggb
diff --git a/docs/graphics/d_outer.ggb b/docs/graphics/d_outer.ggb
diff --git a/docs/physics/montecarlo.rst b/docs/physics/montecarlo.rst
@@ -6,17 +6,28 @@ Radiative Monte Carlo
 
 .. :currentmodule:: tardis.montecarlo_multizone
 
-The radiative monte carlo is initiated once the model is constructed.
 
-Different line interactions
+Montecarlo Geometry
+^^^^^^^^^^^^^^^^^^^
+
+Before any packet action is performed we calculate four different distances
+ ( :math:`d_\textrm{inner}, d_\textrm{outer}, d_\textrm{line}, d_{\textrm{e}^{-}}` )
+
+The calculations for the distance to the outer boundary:
+
+.. image:: ../graphics/d_outer.png
+    :width: 400
+
+The calculations for the distance to the inner boundary:
+
+.. image:: ../graphics/d_inner.png
+    :width: 400
+
 
 
-line_interaction_id == 0: scatter
-line_interaction_id == 1: downbranch
-line_interaction_id == 2: macro
 
 Radiationfield estimators
--------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^
 
 During the monte-carlo run we collect two estimators for the radiation field:
 

diff --git a/docs/rtd-pip-requirements b/docs/rtd-pip-requirements
@@ -5,4 +5,5 @@ pybtex
 Cython
 astropy
 sphinx_bootstrap_theme
-sphinxcontrib-bibtex
+sphinxcontrib-bibtex
+sphinxcontrib-tikz