Changeset 33e475a in sasmodels for sasmodels/models


Ignore:
Timestamp:
Aug 26, 2017 8:17:30 PM (7 years ago)
Author:
paperspace <paperspace@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
573ffab
Parents:
d439007 (diff), bedb9b0 (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' of https://github.com/SasView/sasmodels.git

Location:
sasmodels/models
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/multilayer_vesicle.py

    r5d23de2 r870a2f4  
    7171  sufficiently fine grained in certain cases. Please report any such occurences 
    7272  to the SasView team. Generally, for the best possible experience: 
    73  * Start with the best possible guess 
    74  * Using a priori knowledge, hold as many parameters fixed as possible 
    75  * if N=1, tw (water thickness) must by definition be zero. Both N and tw should 
     73 
     74 - Start with the best possible guess 
     75 - Using a priori knowledge, hold as many parameters fixed as possible 
     76 - if N=1, tw (water thickness) must by definition be zero. Both N and tw should 
    7677   be fixed during fitting. 
    77  * If N>1, use constraints to keep N > 1 
    78  * Because N only really moves in integer steps, it may get "stuck" if the 
     78 - If N>1, use constraints to keep N > 1 
     79 - Because N only really moves in integer steps, it may get "stuck" if the 
    7980   optimizer step size is too small so care should be taken 
    8081   If you experience problems with this please contact the SasView team and let 
  • sasmodels/models/star_polymer.py

    r40a87fa rd439007  
    11r""" 
    2 The Benoit model for a simple star polymer, with Gaussian coils arms from 
    3 a common point. 
    4  
    52Definition 
    63---------- 
     4 
     5Calcuates the scattering from a simple star polymer with f equal Gaussian coil 
     6arms. A star being defined as a branched polymer with all the branches 
     7emanating from a common central (in the case of this model) point.  It is 
     8derived as a special case of on the Benoit model for general branched 
     9polymers\ [#CITBenoit]_ as also used by Richter ''et. al.''\ [#CITRichter]_ 
    710 
    811For a star with $f$ arms the scattering intensity $I(q)$ is calculated as 
     
    1518where 
    1619 
    17 .. math:: v=\frac{u^2f}{(3f-2)} 
     20.. math:: v=\frac{uf}{(3f-2)} 
    1821 
    1922and 
     
    2124.. math:: u = \left\langle R_{g}^2\right\rangle q^2 
    2225 
    23 contains the square of the ensemble average radius-of-gyration of an arm. 
     26contains the square of the ensemble average radius-of-gyration of the full 
     27polymer while v contains the radius of gyration of a single arm $R_{arm}$. 
     28The two are related as: 
     29 
     30.. math:: R_{arm}^2 = \frac{f}{3f-2} R_{g}^2 
     31 
    2432Note that when there is only one arm, $f = 1$, the Debye Gaussian coil 
    25 equation is recovered. Star polymers in solutions tend to have strong 
    26 interparticle and osmotic effects, so the Benoit equation may not work well. 
    27 At small $q$ the Guinier term and hence $I(q=0)$ is the same as for $f$ arms 
    28 of radius of gyration $R_g$, as described for the :ref:`mono-gauss-coil` model. 
     33equation is recovered. 
     34 
     35.. note:: 
     36   Star polymers in solutions tend to have strong interparticle and osmotic 
     37   effects. Thus the Benoit equation may not work well for many real cases. 
     38   At small $q$ the Guinier term and hence $I(q=0)$ is the same as for $f$ arms 
     39   of radius of gyration $R_g$, as described for the :ref:`mono-gauss-coil` 
     40   model. A newer model for star polymer incorporating excluded volume has been 
     41   developed by Li et al in arXiv:1404.6269 [physics.chem-ph]. 
    2942 
    3043References 
    3144---------- 
    3245 
    33 H Benoit *J. Polymer Science*, 11, 596-599 (1953) 
     46.. [#CITBenoit] H Benoit *J. Polymer Science*, 11, 507-510 (1953) 
     47.. [#CITRichter] D Richter, B. Farago, J. S. Huang, L. J. Fetters, 
     48   B Ewen *Macromolecules*, 22, 468-472 (1989) 
     49 
     50Authorship and Verification 
     51---------------------------- 
     52 
     53* **Author:** Kieran Campbell **Date:** July 24, 2012 
     54* **Last Modified by:** Paul Butler **Date:** Auguts 26, 2017 
     55* **Last Reviewed by:** Ziang Li and Richard Heenan **Date:** May 17, 2017 
    3456""" 
    3557 
     
    4567        - v = u^2f/(3f-2) 
    4668        - u = <R_g^2>q^2, where <R_g^2> is the ensemble average radius of 
    47         gyration squared of an arm 
     69        gyration squared of the entire polymer 
    4870        - f is the number of arms on the star 
     71        - the radius of gyration of an arm is given b 
     72        Rg_arm^2 = R_g^2 * f/(3f-2) 
    4973        """ 
    5074category = "shape-independent" 
     
    5276# pylint: disable=bad-whitespace, line-too-long 
    5377#             ["name", "units", default, [lower, upper], "type","description"], 
    54 parameters = [["rg_squared", "Ang^2", 100.0, [0.0, inf], "", "Ensemble radius of gyration SQUARED of an arm"], 
     78parameters = [["rg_squared", "Ang^2", 100.0, [0.0, inf], "", "Ensemble radius of gyration SQUARED of the full polymer"], 
    5579              ["arms",    "",      3,   [1.0, 6.0], "", "Number of arms in the model"], 
    5680             ] 
Note: See TracChangeset for help on using the changeset viewer.