Changeset 1916c52 in sasmodels


Ignore:
Timestamp:
Apr 7, 2017 5:56:11 AM (3 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:
e6ab0d3
Parents:
14207bb
Message:

more bugs in oriened assym particles docs

Location:
sasmodels/models
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/core_shell_parallelepiped.py

    r14207bb r1916c52  
    1010 
    1111.. note:: 
    12    This model was originally ported from NIST IGOR macros. However,t is not 
    13    yet fully understood by the SasView developers and is currently review. 
     12   This model was originally ported from NIST IGOR macros. However, it is not 
     13   yet fully understood by the SasView developers and is currently under review. 
    1414 
    1515The form factor is normalized by the particle volume $V$ such that 
     
    3333$(=t_C)$ faces. The projection in the $AB$ plane is then 
    3434 
    35 .. image:: img/core_shell_parallelepiped_projection.png 
     35.. image:: img/core_shell_parallelepiped_projection.jpg 
    3636 
    3737The volume of the solid is 
     
    5151 
    5252    F_{a}(Q,\alpha,\beta)= 
    53     \left[\frac{\tfrac{1}{2}\sin(Q(L_A+2t_A)\sin\alpha \sin\beta)}{\tfrac{1}{2}Q(L_A+2t_A)\sin\alpha\sin\beta} 
     53    \left[\frac{\sin(\tfrac{1}{2}Q(L_A+2t_A)\sin\alpha \sin\beta)}{\tfrac{1}{2}Q(L_A+2t_A)\sin\alpha\sin\beta} 
    5454    - \frac{\sin(\tfrac{1}{2}QL_A\sin\alpha \sin\beta)}{\tfrac{1}{2}QL_A\sin\alpha \sin\beta} \right] 
    5555    \left[\frac{\sin(\tfrac{1}{2}QL_B\sin\alpha \sin\beta)}{\tfrac{1}{2}QL_B\sin\alpha \sin\beta} \right] 
     
    5858.. note:: 
    5959 
     60    Why does t_B not appear in the above equation? 
    6061    For the calculation of the form factor to be valid, the sides of the solid 
    61     MUST be chosen such that** $A < B < C$. 
     62    MUST (perhaps not any more?) be chosen such that** $A < B < C$. 
    6263    If this inequality is not satisfied, the model will not report an error, 
    6364    but the calculation will not be correct and thus the result wrong. 
     
    9596    Definition of the angles for oriented core-shell parallelepipeds. 
    9697 
    97 .. figure:: img/parallelepiped_angle_projection.jpg 
     98.. figure:: img/parallelepiped_angle_projection.png 
    9899 
    99100    Examples of the angles for oriented core-shell parallelepipeds against the 
  • sasmodels/models/parallelepiped.py

    r14207bb r1916c52  
    1414 
    1515.. _parallelepiped-image: 
     16 
    1617 
    1718.. figure:: img/parallelepiped_geometry.jpg 
Note: See TracChangeset for help on using the changeset viewer.