Ignore:
Timestamp:
Apr 7, 2017 10:59:30 AM (7 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
3fd0499, 1f65db5
Parents:
e6ab0d3 (diff), 43ff77c (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 'ticket-852-unit-tests' into ticket-890

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/elliptical_cylinder.py

    r15a90c1 r16a8c63  
    109109""" 
    110110 
    111 from numpy import pi, inf, sqrt 
     111from numpy import pi, inf, sqrt, sin, cos 
    112112 
    113113name = "elliptical_cylinder" 
     
    150150                           + (length + radius) * (length + pi * radius)) 
    151151    return 0.5 * (ddd) ** (1. / 3.) 
     152q = 0.1 
     153# april 6 2017, rkh added a 2d unit test, NOT READY YET pull #890 branch assume correct! 
     154qx = q*cos(pi/6.0) 
     155qy = q*sin(pi/6.0) 
    152156 
    153157tests = [ 
     
    159163      'sld_solvent':1.0, 'background':0.0}, 
    160164     0.001, 675.504402], 
     165#    [{'theta':80., 'phi':10.}, (qx, qy), 7.88866563001 ], 
    161166] 
Note: See TracChangeset for help on using the changeset viewer.