Changes in / [797a8e3:f80f334] in sasmodels


Ignore:
Location:
sasmodels/models
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/be_polyelectrolyte.py

    rbf9de53 r5df888c  
    6767* **Author:** NIST IGOR/DANSE **Date:** pre 2010 
    6868* **Last Modified by:** Paul Kienzle **Date:** July 24, 2016 
    69 * **Last Reviewed by:** Paul Butler and Richard Heenan **Date:**  
    70   October 07, 2016 
     69* **Last Reviewed by:** Piotr rozyczko **Date:** January 27, 2016 
    7170""" 
    7271 
  • sasmodels/models/core_multi_shell.py

    r2d73a53 rb0c4271  
    1313 
    1414The 2D scattering intensity is the same as $P(q)$ above, regardless of the 
    15 orientation of the $\vec q$ vector which is defined as 
     15orientation of the $q$ vector which is defined as 
    1616 
    1717.. math:: 
     
    2929 
    3030Our model uses the form factor calculations implemented in a c-library provided 
    31 by the NIST Center for Neutron Research (Kline, 2006) [#kline]_. 
     31by the NIST Center for Neutron Research (Kline, 2006). 
    3232 
    3333References 
     
    3535 
    3636.. [#] See the :ref:`core-shell-sphere` model documentation. 
    37 .. [#kline] S R Kline, *J Appl. Cryst.*, 39 (2006) 895 
    38 .. [#] L A Feigin and D I Svergun, *Structure Analysis by Small-Angle X-Ray and 
    39    Neutron Scattering*, Plenum Press, New York, 1987. 
     37.. [#] L A Feigin and D I Svergun, *Structure Analysis by Small-Angle X-Ray and Neutron Scattering*, 
     38   Plenum Press, New York, 1987. 
    4039 
    4140Authorship and Verification 
     
    4443* **Author:** NIST IGOR/DANSE **Date:** pre 2010 
    4544* **Last Modified by:** Paul Kienzle **Date:** September 12, 2016 
    46 * **Last Reviewed by:** Paul Kienzle **Date:** September 12, 2016 
     45* **Last Reviewed by:** Under Review **Date:** as of October 5, 2016 
    4746""" 
    4847 
  • sasmodels/models/core_shell_cylinder.py

    r755ecc2 r40a87fa  
     1# core shell cylinder model 
     2# Note: model title and parameter table are inserted automatically 
    13r""" 
     4The form factor is normalized by the particle volume. 
     5 
    26Definition 
    37---------- 
    48 
    59The output of the 2D scattering intensity function for oriented core-shell 
    6 cylinders is given by (Kline, 2006 [#kline]_). The form factor is normalized 
    7 by the particle volume. 
     10cylinders is given by (Kline, 2006) 
    811 
    912.. math:: 
     
    5861The $\theta$ and $\phi$ parameters are not used for the 1D output. 
    5962 
     63Validation 
     64---------- 
     65 
     66Validation of our code was done by comparing the output of the 1D model to 
     67the output of the software provided by the NIST (Kline, 2006). 
     68 
     69Averaging over a distribution of orientation is done by evaluating the 
     70equation above. Since we have no other software to compare the 
     71implementation of the intensity for fully oriented cylinders, we 
     72compared the result of averaging our 2D output using a uniform 
     73distribution $p(\theta,\phi) = 1.0$. 
     74 
    6075Reference 
    6176--------- 
     77see, for example, Ian Livsey  J. Chem. Soc., Faraday Trans. 2, 1987,83, 1445-1452 
    6278 
    63 .. [#] see, for example, Ian Livsey  J. Chem. Soc., Faraday Trans. 2, 1987,83, 
    64    1445-1452 
    65 .. [#kline] S R Kline, *J Appl. Cryst.*, 39 (2006) 895 
    66  
    67 Authorship and Verification 
    68 ---------------------------- 
    69  
    70 * **Author:** NIST IGOR/DANSE **Date:** pre 2010 
    71 * **Last Modified by:** Paul Kienzle **Date:** Aug 8, 2016 
    72 * **Last Reviewed by:** Richard Heenan **Date:** March 18, 2016 
     792016/03/18 - Description reviewed by RKH 
    7380""" 
    7481 
     
    151158            theta_pd=15, theta_pd_n=45, 
    152159            phi_pd=15, phi_pd_n=1) 
    153  
     160# ADDED by:  RKH  ON: 18Mar2016 renamed sld's etc 
  • sasmodels/models/core_shell_parallelepiped.py

    r5810f00 r14838a3  
     1# core_shell_parallelepiped model 
     2# Note: model title and parameter table are inserted automatically 
    13r""" 
    2 Definition 
    3 ---------- 
    4  
    54Calculates the form factor for a rectangular solid with a core-shell structure. 
    65**The thickness and the scattering length density of the shell or "rim" 
     
    1615of the rectangular solid. 
    1716 
     17An instrument resolution smeared version of the model is also provided. 
     18 
     19 
     20Definition 
     21---------- 
    1822 
    1923The function calculated is the form factor of the rectangular solid below. 
     
    3741**meaning that there are "gaps" at the corners of the solid.** 
    3842 
    39 The intensity calculated follows the :ref:`parallelepiped` model, with the 
    40 core-shell intensity being calculated as the square of the sum of the 
    41 amplitudes of the core and shell, in the same manner as a core-shell model. 
     43The intensity calculated follows the :ref:`parallelepiped` model, with the core-shell 
     44intensity being calculated as the square of the sum of the amplitudes of the 
     45core and shell, in the same manner as a core-shell model. 
    4246 
    43 .. math:: 
    44  
    45     F_{a}(Q,\alpha,\beta)= 
    46     \Bigg(\frac{sin(Q(L_A+2t_A)/2sin\alpha sin\beta)}{Q(L_A+2t_A)/2sin\alpha 
    47     sin\beta)} 
    48     - \frac{sin(QL_A/2sin\alpha sin\beta)}{QL_A/2sin\alpha sin\beta)} \Bigg) 
    49     + \frac{sin(QL_B/2sin\alpha sin\beta)}{QL_B/2sin\alpha sin\beta)} 
    50     + \frac{sin(QL_C/2sin\alpha sin\beta)}{QL_C/2sin\alpha sin\beta)} 
    51  
    52 .. note:: 
    53  
    54     For the calculation of the form factor to be valid, the sides of the solid 
    55     MUST be chosen such that** $A < B < C$. 
    56     If this inequality is not satisfied, the model will not report an error, 
    57     but the calculation will not be correct and thus the result wrong. 
     47**For the calculation of the form factor to be valid, the sides of the solid 
     48MUST be chosen such that** $A < B < C$. 
     49**If this inequality is not satisfied, the model will not report an error, 
     50and the calculation will not be correct.** 
    5851 
    5952FITTING NOTES 
    6053If the scale is set equal to the particle volume fraction, |phi|, the returned 
    6154value is the scattered intensity per unit volume, $I(q) = \phi P(q)$. 
    62 However, **no interparticle interference effects are included in this 
    63 calculation.** 
     55However, **no interparticle interference effects are included in this calculation.** 
    6456 
    6557There are many parameters in this model. Hold as many fixed as possible with 
     
    7668and length $(C+2t_C)$ values, and used as the effective radius 
    7769for $S(Q)$ when $P(Q) * S(Q)$ is applied. 
     70 
     71.. Comment by Miguel Gonzalez: 
     72   The later seems to contradict the previous statement that interparticle interference 
     73   effects are not included. 
    7874 
    7975To provide easy access to the orientation of the parallelepiped, we define the 
     
    10298---------- 
    10399 
    104 .. [#] P Mittelbach and G Porod, *Acta Physica Austriaca*, 14 (1961) 185-211 
    105     Equations (1), (13-14). (in German) 
    106 .. [#] D Singh (2009). *Small angle scattering studies of self assembly in 
    107    lipid mixtures*, John's Hopkins University Thesis (2009) 223-225. `Available 
    108    from Proquest <http://search.proquest.com/docview/304915826?accountid 
    109    =26379>`_ 
     100P Mittelbach and G Porod, *Acta Physica Austriaca*, 14 (1961) 185-211 
     101Equations (1), (13-14). (in German) 
    110102 
    111 Authorship and Verification 
    112 ---------------------------- 
    113  
    114 * **Author:** NIST IGOR/DANSE **Date:** pre 2010 
    115 * **Last Modified by:** Paul Butler **Date:** September 30, 2016 
    116 * **Last Reviewed by:** Miguel Gonzales **Date:** March 21, 2016 
    117103""" 
    118104 
Note: See TracChangeset for help on using the changeset viewer.