Merge branch 'develop' into mg_docs

This commit is contained in:
Adam Nelson 2016-06-15 10:19:46 -04:00
commit 9924248d25
254 changed files with 25829 additions and 20840 deletions

View file

@ -437,6 +437,8 @@ where :math:`(x_0, y_0, z_0)` are the coordinates to the lower-left-bottom
corner of the lattice, and :math:`p_0, p_1, p_2` are the pitches along the
:math:`x`, :math:`y`, and :math:`z` axes, respectively.
.. _hexagonal_indexing:
Hexagonal Lattice Indexing
--------------------------