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


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

Legend:

Unmodified
Added
Removed

  • sasmodels/models/bcc_paracrystal.py

    re2d6e3b r1f65db5  
    7979be accurate. 
    8080 
    81 .. figure:: img/bcc_angle_definition.png 
     81.. figure:: img/parallelepiped_angle_definition.png 
    8282 
    83     Orientation of the crystal with respect to the scattering plane. 
     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). 
    8485 
    8586References 

  • sasmodels/models/core_shell_parallelepiped.py

    r1916c52 r1f65db5  
    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 model does **NOT** actually calculate a c face rim despite the presence of 
    9 the parameter. 
     8the 1D calculation does **NOT** actually calculate a c face rim despite the presence of 
     9the parameter. Some other aspects of the 1D calculation may be wrong. 
    1010 
    1111.. note:: 

  • sasmodels/models/fcc_paracrystal.py

    re2d6e3b r1f65db5  
    76762D model computation. 
    7777 
    78 .. figure:: img/bcc_angle_definition.png 
     78.. figure:: img/parallelepiped_angle_definition.png 
    7979 
    80     Orientation of the crystal with respect to the scattering plane. 
     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). 
    8182 
    8283References 

  • sasmodels/models/sc_paracrystal.py

    r3330bb4 r1f65db5  
    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======= 
    8591.. figure:: img/sc_crystal_angle_definition.jpg 
     92>>>>>>> 3fd04991e2575b02401723d8534c376cd9b66305 
    8693 
    8794Reference 

  • sasmodels/models/triaxial_ellipsoid.py

    r3330bb4 r1f65db5  
    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======= 
    115118* **Last Reviewed by:** Paul Kienzle & Richard Heenan **Date:**  April 4, 2017 
     119>>>>>>> 3fd04991e2575b02401723d8534c376cd9b66305 
    116120 
    117121""" 
Note: See TracChangeset for help on using the changeset viewer.