Changeset 10ee838 in sasmodels


Ignore:
Timestamp:
Nov 29, 2017 11:45:34 PM (5 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
c11d09f, 0f113fb
Parents:
4493288
Message:

core_shell_parallelepiped: use ER from parallelepiped, with a, b, c dimensions including the rim

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/core_shell_parallelepiped.py

    r4493288 r10ee838  
    188188        Return equivalent radius (ER) 
    189189    """ 
    190  
    191     # surface average radius (rough approximation) 
    192     surf_rad = sqrt((length_a + 2.0*thick_rim_a) 
    193                     * (length_b + 2.0*thick_rim_b) / pi) 
    194  
    195     height = length_c + 2.0*thick_rim_c 
    196  
    197     ddd = (0.75 * surf_rad * (2 * surf_rad * height 
    198            + (height + surf_rad) * (height + pi * surf_rad))) 
    199     return 0.5 * (ddd) ** (1. / 3.) 
     190    from .parallelepiped import ER as ER_p 
     191 
     192    a = length_a + 2*thick_rim_a 
     193    b = length_b + 2*thick_rim_b 
     194    c = length_c + 2*thick_rim_c 
     195    return ER_p(a, b, c) 
    200196 
    201197# VR defaults to 1.0 
Note: See TracChangeset for help on using the changeset viewer.