Changeset 737679d in sasmodels for sasmodels/models/sc_paracrystal.py

Timestamp:

Apr 8, 2017 3:21:45 AM (7 years ago)

Author:

richardh

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c, 9b79f29

Parents:

1f65db5 (diff), 3fd0499 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

docs edits for bcc_ fc_ sc_paracrystal

File:

• sasmodels/models/sc_paracrystal.py (modified) (1 diff)

sasmodels/models/sc_paracrystal.py

@@ -83 +83 @@
 model computation.
 
+<<<<<<< HEAD
 .. figure:: img/parallelepiped_angle_definition.png
 
     Orientation of the crystal with respect to the scattering plane, when 
     $\theta = \phi = 0$ the $c$ axis is along the beam direction (the $z$ axis).
+=======
+.. figure:: img/sc_crystal_angle_definition.jpg
+>>>>>>> 3fd04991e2575b02401723d8534c376cd9b66305
 
 Reference