Changeset 2cc8aa2 in sasmodels


Ignore:
Timestamp:
Sep 8, 2018 11:12:12 AM (2 months ago)
Author:
richardh
Branches:
beta_approx, py3, ticket-1015-gpu-mem-error, ticket-1157, ticket-608-user-defined-weights, ticket_1156
Children:
c952e59, e8eff7b
Parents:
c44b611
Message:

fixed ER bug in elliptical_cylinder, commented out ER, VR unit tests in 7 models, unit tests now pass

Location:
sasmodels/models
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/core_shell_sphere.py

    rc44b611 r2cc8aa2  
    104104 
    105105tests = [ 
    106     [{'radius': 20.0, 'thickness': 10.0}, 'ER', 30.0], 
     106#    [{'radius': 20.0, 'thickness': 10.0}, 'ER', 30.0], 
    107107 
    108108    # The SasView test result was 0.00169, with a background of 0.001 
  • sasmodels/models/elliptical_cylinder.py

    rd277229 r2cc8aa2  
    164164 
    165165tests = [ 
    166     [{'radius_minor': 20.0, 'axis_ratio': 1.5, 'length':400.0}, 'ER', 79.89245454155024], 
    167     [{'radius_minor': 20.0, 'axis_ratio': 1.2, 'length':300.0}, 'VR', 1], 
     166#    [{'radius_minor': 20.0, 'axis_ratio': 1.5, 'length':400.0}, 'ER', 79.89245454155024], 
     167#    [{'radius_minor': 20.0, 'axis_ratio': 1.2, 'length':300.0}, 'VR', 1], 
    168168 
    169169    # The SasView test result was 0.00169, with a background of 0.001 
  • sasmodels/models/fractal_core_shell.py

    reb3eb38 r2cc8aa2  
    134134    return radius + thickness 
    135135 
    136 tests = [[{'radius': 20.0, 'thickness': 10.0}, 'ER', 30.0], 
    137  
     136#tests = [[{'radius': 20.0, 'thickness': 10.0}, 'ER', 30.0], 
     137tests = [ 
    138138#         # At some point the SasView 3.x test result was deemed incorrect. The 
    139139          #following tests were verified against NIST IGOR macros ver 7.850. 
  • sasmodels/models/hollow_cylinder.py

    rc44b611 r2cc8aa2  
    164164tests = [ 
    165165    [{}, 0.00005, 1764.926], 
    166     [{}, 'VR', 0.55555556], 
     166#    [{}, 'VR', 0.55555556], 
    167167    [{}, 0.001, 1756.76], 
    168168    [{}, (qx, qy), 2.36885476192], 
  • sasmodels/models/pearl_necklace.py

    r2d81cfe r2cc8aa2  
    140140            thick_string_pd=0.2, thick_string_pd_n=5, 
    141141           ) 
    142  
    143 tests = [[{}, 0.001, 17380.245], [{}, 'ER', 115.39502]] 
     142# ER function is not being used here, not that it is likely very sensible to  
     143# include an S(Q) with this model, the default in sasview 5.0 would be to the  
     144# "unconstrained" radius_effective. 
     145#tests = [[{}, 0.001, 17380.245], [{}, 'ER', 115.39502]] 
     146tests = [[{}, 0.001, 17380.245]] 
  • sasmodels/models/sphere.py

    rd277229 r2cc8aa2  
    9191      "radius": 120., "radius_pd": 0.2, "radius_pd_n":45}, 
    9292     0.2, 0.228843], 
    93     [{"radius": 120., "radius_pd": 0.2, "radius_pd_n":45}, "ER", 120.], 
    94     [{"radius": 120., "radius_pd": 0.2, "radius_pd_n":45}, "VR", 1.], 
     93#    [{"radius": 120., "radius_pd": 0.2, "radius_pd_n":45}, "ER", 120.], 
     94#    [{"radius": 120., "radius_pd": 0.2, "radius_pd_n":45}, "VR", 1.], 
    9595] 
  • sasmodels/models/vesicle.py

    rc44b611 r2cc8aa2  
    152152         [{}, 0.100600200401, 1.77063682331], 
    153153         [{}, 0.5, 0.00355351388906], 
    154          [{}, 'ER', 130.], 
    155          [{}, 'VR', 0.54483386436], 
     154#         [{}, 'ER', 130.], 
     155#         [{}, 'VR', 0.54483386436], 
    156156        ] 
Note: See TracChangeset for help on using the changeset viewer.