Ignore:
Timestamp:
Oct 30, 2017 1:21:00 PM (6 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
bcb5594
Parents:
5b5ea20 (diff), ef969d9 (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:

Merge branch 'master' into ticket-776-orientation

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/core_shell_parallelepiped.py

    reda8b30 r904cd9c  
    8585effective radius, for $S(Q)$ when $P(Q) * S(Q)$ is applied. 
    8686 
    87 For 2d data the orientation of the particle is required, described using  
    88 angles $\theta$, $\phi$ and $\Psi$ as in the diagrams below, for further details  
     87For 2d data the orientation of the particle is required, described using 
     88angles $\theta$, $\phi$ and $\Psi$ as in the diagrams below, for further details 
    8989of the calculation and angular dispersions see :ref:`orientation` . 
    90 The angle $\Psi$ is the rotational angle around the *long_c* axis. For example,  
     90The angle $\Psi$ is the rotational angle around the *long_c* axis. For example, 
    9191$\Psi = 0$ when the *short_b* axis is parallel to the *x*-axis of the detector. 
    9292 
Note: See TracChangeset for help on using the changeset viewer.