Changes in / [737679d:3fd0499] in sasmodels


Ignore:
Location:
sasmodels/models
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/bcc_paracrystal.py

    r1f65db5 re2d6e3b  
    7979be accurate. 
    8080 
    81 .. figure:: img/parallelepiped_angle_definition.png 
     81.. figure:: img/bcc_angle_definition.png 
    8282 
    83     Orientation of the crystal with respect to the scattering plane, when  
    84     $\theta = \phi = 0$ the $c$ axis is along the beam direction (the $z$ axis). 
     83    Orientation of the crystal with respect to the scattering plane. 
    8584 
    8685References 

  • sasmodels/models/core_shell_parallelepiped.py

    r1f65db5 r1916c52  
    66The thickness and the scattering length density of the shell or  
    77"rim" can be different on each (pair) of faces. However at this time 
    8 the 1D calculation does **NOT** actually calculate a c face rim despite the presence of 
    9 the parameter. Some other aspects of the 1D calculation may be wrong. 
     8the model does **NOT** actually calculate a c face rim despite the presence of 
     9the parameter. 
    1010 
    1111.. note:: 

  • sasmodels/models/fcc_paracrystal.py

    r1f65db5 re2d6e3b  
    76762D model computation. 
    7777 
    78 .. figure:: img/parallelepiped_angle_definition.png 
     78.. figure:: img/bcc_angle_definition.png 
    7979 
    80     Orientation of the crystal with respect to the scattering plane, when  
    81     $\theta = \phi = 0$ the $c$ axis is along the beam direction (the $z$ axis). 
     80    Orientation of the crystal with respect to the scattering plane. 
    8281 
    8382References 

  • sasmodels/models/sc_paracrystal.py

    r1f65db5 r3330bb4  
    8383model computation. 
    8484 
    85 <<<<<<< HEAD 
    86 .. figure:: img/parallelepiped_angle_definition.png 
    87  
    88     Orientation of the crystal with respect to the scattering plane, when  
    89     $\theta = \phi = 0$ the $c$ axis is along the beam direction (the $z$ axis). 
    90 ======= 
    9185.. figure:: img/sc_crystal_angle_definition.jpg 
    92 >>>>>>> 3fd04991e2575b02401723d8534c376cd9b66305 
    9386 
    9487Reference 

  • sasmodels/models/triaxial_ellipsoid.py

    r1f65db5 r3330bb4  
    113113* **Author:** NIST IGOR/DANSE **Date:** pre 2010 
    114114* **Last Modified by:** Paul Kienzle (improved calculation) **Date:** April 4, 2017 
    115 <<<<<<< HEAD 
    116 * **Last Reviewed by:** Paul Kienzle &Richard Heenan **Date:**  April 4, 2017 
    117 ======= 
    118115* **Last Reviewed by:** Paul Kienzle & Richard Heenan **Date:**  April 4, 2017 
    119 >>>>>>> 3fd04991e2575b02401723d8534c376cd9b66305 
    120116 
    121117""" 
Note: See TracChangeset for help on using the changeset viewer.