# Changeset 18d732c in sasmodels

Ignore:
Timestamp:
Apr 8, 2017 5:29:21 AM (7 months ago)
Branches:
master, costrafo411, doc_update, flexible-cylinder, ticket-776-orientation
Children:
0881f4e
Parents:
afd4692 (diff), 737679d (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 'ticket-890' of github.com:sasview/sasmodels into ticket-890

Location:
sasmodels/models
Files:
2 deleted
6 edited

Unmodified
Removed
• ## sasmodels/models/bcc_paracrystal.py

 re2d6e3b be accurate. .. figure:: img/bcc_angle_definition.png .. figure:: img/parallelepiped_angle_definition.png Orientation of the crystal with respect to the scattering plane. 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). References
• ## sasmodels/models/core_shell_parallelepiped.py

 r1916c52 The thickness and the scattering length density of the shell or "rim" can be different on each (pair) of faces. However at this time the model does **NOT** actually calculate a c face rim despite the presence of the parameter. the 1D calculation does **NOT** actually calculate a c face rim despite the presence of the parameter. Some other aspects of the 1D calculation may be wrong. .. note::
• ## sasmodels/models/fcc_paracrystal.py

 re2d6e3b 2D model computation. .. figure:: img/bcc_angle_definition.png .. figure:: img/parallelepiped_angle_definition.png Orientation of the crystal with respect to the scattering plane. 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). References
• ## sasmodels/models/sc_paracrystal.py

 r3330bb4 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
• ## sasmodels/models/triaxial_ellipsoid.py

 rafd4692 * **Author:** NIST IGOR/DANSE **Date:** pre 2010 * **Last Modified by:** Paul Kienzle (improved calculation) **Date:** April 4, 2017 <<<<<<< HEAD * **Last Reviewed by:** Paul Kienzle &Richard Heenan **Date:**  April 4, 2017 ======= * **Last Reviewed by:** Paul Kienzle & Richard Heenan **Date:**  April 4, 2017 >>>>>>> 3fd04991e2575b02401723d8534c376cd9b66305 """
• ## sasmodels/models/parallelepiped.py

 r3fd0499 The edge of the solid used to have to satisfy the condition that $A < B < C$. After some improvements to the effective radius calculation, used with an S(Q), it is beleived that this is no longer the case. After some improvements to the effective radius calculation, used with an S(Q), it is beleived that this is no longer the case. The 1D scattering intensity $I(q)$ is calculated as: NB: The 2nd virial coefficient of the parallelepiped is calculated based on the averaged effective radius, after appropriately sorting the three dimensions, to give an oblate or prolate particle, $(=\sqrt{A B / \pi})$ and the averaged effective radius, after appropriately sorting the three dimensions, to give an oblate or prolate particle, $(=\sqrt{AB/\pi})$ and length $(= C)$ values, and used as the effective radius for $S(q)$ when $P(q) \cdot S(q)$ is applied. .. figure:: img/parallelepiped_angle_definition.png Definition of the angles for oriented parallelepiped, shown with $A < B < C$. Definition of the angles for oriented parallelepiped, shown with \$A
Note: See TracChangeset for help on using the changeset viewer.