Changeset b7c2fce in sasmodels


Ignore:
Timestamp:
Feb 17, 2016 3:02:54 PM (7 years ago)
Author:
Doucet, Mathieu <doucetm@…>
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:
19b6d28
Parents:
c612162
Message:

Fix pylint and add clarity to description.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/elliptical_cylinder.py

    rc612162 rb7c2fce  
    2222 
    2323.. math:: 
    24     F(\mathbf{q},\alpha,\psi)=2\frac{J_1(a)\sin(b)}{ab}  
     24    F(\mathbf{q},\alpha,\psi)=2\frac{J_1(a)\sin(b)}{ab} 
    2525    \\ 
    2626    a = \mathbf{q}\sin(\alpha)\left[ r^2_{major}\sin^2(\psi)+r^2_{minor}\cos(\psi) \right]^{1/2} 
     
    2828    b=\mathbf{q}\frac{L}{2}\cos(\alpha) 
    2929 
    30 and the angle |bigpsi| is defined as the orientation of the major axis of the ellipse with respect to the vector *q*\ . 
     30and the angle |bigpsi| is defined as the orientation of the major axis of the ellipse with respect to the vector $\vec q$ . 
     31The angle $\alpha$ is the angle between the axis of the cylinder and $\vec q$. 
    3132 
    3233 
     
    129130        @param length: Length of the cylinder 
    130131    """ 
    131     r = math.sqrt(r_minor * r_minor * r_ratio) 
    132     ddd = 0.75 * r * (2 * r * length + (length + r) * (length + pi * r)) 
     132    radius = math.sqrt(r_minor * r_minor * r_ratio) 
     133    ddd = 0.75 * radius * (2 * radius * length + (length + radius) * (length + pi * radius)) 
    133134    return 0.5 * (ddd) ** (1. / 3.) 
    134135 
Note: See TracChangeset for help on using the changeset viewer.