Changeset 6b4f7f6 in sasmodels


Ignore:
Timestamp:
Mar 22, 2016 1:51:26 PM (8 years ago)
Author:
richardh
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
55b2b232
Parents:
e664a11
Message:

renamed variables, sorted issues in doc

Location:
sasmodels/models
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/mono_gauss_coil.py

    rf10bc52 r6b4f7f6  
    66 
    77r""" 
    8 This model strictly describes the scattering from *monodisperse* polymer chains in theta solvents or polymer melts, conditions under which the distances between segments follow a Gaussian distribution. Provided the number of segments is large (ie, high molecular weight polymers) the single-chain form factor P(Q) is that described by Debye (1947). 
     8This Debye Gaussian coil model strictly describes the scattering from *monodisperse* polymer chains in theta solvents or polymer melts, conditions under which the distances between segments follow a Gaussian distribution. Provided the number of segments is large (ie, high molecular weight polymers) the single-chain form factor P(Q) is that described by Debye (1947). 
    99 
    10 To describe the scattering from *polydisperse* polymer chains, see the To describe the scattering from *monodisperse* polymer chains, see the :ref:`poly_gauss_coil <poly-gauss-coil>` model. 
     10To describe the scattering from *polydisperse* polymer chains see the :ref:`poly_gauss_coil <poly-gauss-coil>` model. 
    1111 
    1212Definition 
  • sasmodels/models/star_polymer.py

    raa2edb2 r6b4f7f6  
    11r""" 
    2 Calculates the scattering from fractal-like aggregates based on 
    3 the Mildner reference. This model is also known as the Benoit Star model. 
     2The Benoit model for a simple star polymer, with Gaussian coils arms from  
     3a common point. 
    44 
    55Definition 
     
    2525    u = \left\langle R_{g}^2\right\rangle q^2 
    2626 
    27 is the square of the ensemble average radius-of-gyration of an arm. 
     27contains the square of the ensemble average radius-of-gyration of an arm.  Note that  
     28when there is only one arm, $f$ = 1, the Debye Gaussian coil equation is recovered. 
     29Star polymers in solutions tend to have strong interparticle and osmotic effects, so  
     30the Benoit equation may not work well. At small q the Guinier term and hence I(q=0) 
     31is the same as for $f$ arms of radius of gyration $R_g$, as described for the :ref:`mono_gauss_coil <mono-gauss-coil>`. 
    2832 
    2933 
    30 Reference 
    31 --------- 
     34References 
     35---------- 
    3236 
    3337H Benoit *J. Polymer Science*, 11, 596-599 (1953) 
     
    4145title = "Star polymer model with Gaussian statistics" 
    4246description = """ 
    43         Scattering model class for 'Star polymer with Gaussian statistics' 
     47        Benoit 'Star polymer with Gaussian statistics' 
    4448        with 
    4549        P(q) = 2/{fv^2} * (v - (1-exp(-v)) + {f-1}/2 * (1-exp(-v))^2) 
     
    4751        - v = u^2f/(3f-2) 
    4852        - u = <R_g^2>q^2, where <R_g^2> is the ensemble average radius of 
    49         giration squared of an arm 
     53        gyration squared of an arm 
    5054        - f is the number of arms on the star 
    5155        """ 
     
    5458# pylint: disable=bad-whitespace, line-too-long 
    5559#             ["name", "units", default, [lower, upper], "type","description"], 
    56 parameters = [["radius2", "Ang", 100.0, [0.0, inf], "", "Ensemble radius of gyration squared of an arm"], 
     60parameters = [["rg_squared", "Ang^2", 100.0, [0.0, inf], "", "Ensemble radius of gyration SQUARED of an arm"], 
    5761              ["arms",    "",      3,   [1.0, 6.0], "", "Number of arms in the model"], 
    5862             ] 
     
    6266 
    6367demo = dict(scale=1, background=0, 
    64             radius2=100.0, 
     68            rg_squared=100.0, 
    6569            arms=3.0) 
    6670 
    6771oldname = 'StarPolymer' 
    6872 
    69 oldpars = dict(radius2='R2', 
     73oldpars = dict(rg_squared='R2', 
    7074               arms='arms') 
    7175 
    72 tests = [[{'radius2': 2.0, 
     76tests = [[{'rg_squared': 2.0, 
    7377           'arms':    3.3, 
    7478          }, 0.5, 0.851646091108], 
    7579 
    76          [{'radius2':    1.0, 
     80         [{'rg_squared':    1.0, 
    7781           'arms':       2.0, 
    7882           'background': 1.8, 
    7983          }, 1.0, 2.53575888234], 
    8084        ] 
     85# 23Mar2016  RKH edited docs, would this better use rg not rg^2 ? Numerical noise at extremely small q.rg 
Note: See TracChangeset for help on using the changeset viewer.