Changeset 18d732c in sasmodels


Ignore:
Timestamp:
Apr 8, 2017 5:29:21 AM (7 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
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

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 r737679d  
    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

    rafd4692 r18d732c  
    117117* **Author:** NIST IGOR/DANSE **Date:** pre 2010 
    118118* **Last Modified by:** Paul Kienzle (improved calculation) **Date:** April 4, 2017 
     119<<<<<<< HEAD 
     120* **Last Reviewed by:** Paul Kienzle &Richard Heenan **Date:**  April 4, 2017 
     121======= 
    119122* **Last Reviewed by:** Paul Kienzle & Richard Heenan **Date:**  April 4, 2017 
     123>>>>>>> 3fd04991e2575b02401723d8534c376cd9b66305 
    120124 
    121125""" 

  • sasmodels/models/parallelepiped.py

    r3fd0499 rafd4692  
    2323 
    2424   The edge of the solid used to have to satisfy the condition that $A < B < C$. 
    25    After some improvements to the effective radius calculation, used with an S(Q), 
    26    it is beleived that this is no longer the case. 
     25   After some improvements to the effective radius calculation, used with 
     26   an S(Q), it is beleived that this is no longer the case. 
    2727 
    2828The 1D scattering intensity $I(q)$ is calculated as: 
    … …  
    7272 
    7373NB: The 2nd virial coefficient of the parallelepiped is calculated based on 
    74 the averaged effective radius, after appropriately 
    75 sorting the three dimensions, to give an oblate or prolate particle, $(=\sqrt{A B / \pi})$ and 
     74the averaged effective radius, after appropriately sorting the three 
     75dimensions, to give an oblate or prolate particle, $(=\sqrt{AB/\pi})$ and 
    7676length $(= C)$ values, and used as the effective radius for 
    7777$S(q)$ when $P(q) \cdot S(q)$ is applied. 
    … …  
    106106.. figure:: img/parallelepiped_angle_definition.png 
    107107 
    108     Definition of the angles for oriented parallelepiped, shown with $A < B < C$. 
     108    Definition of the angles for oriented parallelepiped, shown with $A<B<C$. 
    109109 
    110110.. figure:: img/parallelepiped_angle_projection.png 
    … …  
    167167---------------------------- 
    168168 
    169 * **Author:** This model is based on form factor calculations implemented in a c-library 
    170 provided by the NIST Center for Neutron Research (Kline, 2006). 
     169* **Author:** This model is based on form factor calculations implemented 
     170in a c-library provided by the NIST Center for Neutron Research (Kline, 2006). 
    171171* **Last Modified by:**  Paul Kienzle **Date:** April 05, 2017 
    172172* **Last Reviewed by:**  Richard Heenan **Date:** April 06, 2017 
Note: See TracChangeset for help on using the changeset viewer.