Changeset b99734a in sasmodels


Ignore:
Timestamp:
Oct 1, 2016 11:11:33 AM (5 years ago)
Author:
butler
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:
7c57861
Parents:
e0de72f
Message:

fix name of c file called by new core_shell_ellipsoid and edited the
documentation to remove comparison to old core_shell_ellipsoid.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/core_shell_ellipsoid.py

    r5031ca3 rb99734a  
    11r""" 
    2 An alternative version of $P(q)$ for the core_shell_ellipsoid 
    3 having as parameters the core axial ratio X and a shell thickness, 
    4 which are more often what we would like to determine. 
    5  
    6 This model is also better behaved when polydispersity is applied than the four 
    7 independent radii in core_shell_ellipsoid model. 
    8  
    92Definition 
    103---------- 
     4 
     5Parameters for this model are the core axial ratio X and a shell thickness, 
     6which are more often what we would like to determine and makes the model 
     7better behaved, particularly when polydispersity is applied than the four 
     8independent radii used in the original parameterization of this model. 
     9 
    1110 
    1211.. figure:: img/core_shell_ellipsoid_geometry.png 
     
    1413The geometric parameters of this model are 
    1514 
    16 *radius_equat_core =* equatorial core radius *= R_minor_core* 
     15*radius_equat_core =* equatorial core radius *= Rminor_core* 
    1716 
    1817*X_core = polar_core / radius_equat_core = Rmajor_core / Rminor_core* 
     
    5857from numpy import inf, sin, cos, pi 
    5958 
    60 name = "core_shell_ellipsoid_xt" 
     59name = "core_shell_ellipsoid" 
    6160title = "Form factor for an spheroid ellipsoid particle with a core shell structure." 
    6261description = """ 
    63         [core_shell_ellipsoid_xt] Calculates the form factor for an spheroid 
     62        [core_shell_ellipsoid] Calculates the form factor for an spheroid 
    6463        ellipsoid particle with a core_shell structure. 
    6564        The form factor is averaged over all possible 
     
    101100 
    102101source = ["lib/sph_j1c.c", "lib/gfn.c", "lib/gauss76.c", 
    103           "core_shell_ellipsoid_xt.c"] 
     102          "core_shell_ellipsoid.c"] 
    104103 
    105104def ER(radius_equat_core, x_core, thick_shell, x_polar_shell): 
Note: See TracChangeset for help on using the changeset viewer.