Changeset ec45c4f in sasmodels


Ignore:
Timestamp:
Apr 4, 2016 6:45:36 PM (9 years ago)
Author:
Paul Kienzle <pkienzle@…>
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:
3a45c2c, cd0a808
Parents:
f247314
Message:

remove oldname/oldpars from new models

Location:
sasmodels
Files:
74 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/convert.json

    rf247314 rec45c4f  
    574574      "pringle_sld": "sld_pringle" 
    575575    } 
    576   ],  
     576  ], 
     577  "raspberry": [ 
     578    "RaspBerryModel", 
     579    { 
     580    "volfraction_lg": "volf_Lsph", 
     581    "volfraction_sm": "volf_Ssph", 
     582    "radius_sm": "radius_Ssph", 
     583    "radius_lg": "radius_Lsph", 
     584    "sld_lg": "sld_Lsph", 
     585    "sld_sm": "sld_Ssph", 
     586    "sld_solvent": "sld_solv", 
     587    "surface_fraction": "surfrac_Ssph", 
     588    "penetration": "delta_Ssph" 
     589    } 
     590  ], 
    577591  "rectangular_prism": [ 
    578592    "RectangularPrismModel",  

  • sasmodels/models/_spherepy.py

    rd7028dc rec45c4f  
    117117            radius=120, 
    118118            radius_pd=.2, radius_pd_n=45) 
    119 oldname = "SphereModel" 
    120 oldpars = dict(sld='sldSph', sld_solvent='sldSolv', radius='radius') 

  • sasmodels/models/adsorbed_layer.py

    r1d4d409 rec45c4f  
    8282            background = 0.0) 
    8383 
    84 oldname =  "Core2ndMomentModel" 
    85 oldpars =  dict(scale = 'scale', 
    86                second_moment = 'second_moment', 
    87                adsorbed_amount = 'ads_amount', 
    88                density_shell = 'density_poly', 
    89                radius = 'radius_core', 
    90                volfraction = 'volf_cores', 
    91                sld_shell = 'sld_poly', 
    92                sld_solvent = 'sld_solv', 
    93                background = 'background') 
    94  
    9584# these unit test values taken from SasView 3.1.2 
    9685tests =  [ 

  • sasmodels/models/barbell.py

    r02a0920 rec45c4f  
    123123            phi_pd=15, phi_pd_n=0, 
    124124           ) 
    125  
    126 # For testing against the old sasview models, include the converted parameter 
    127 # names and the target sasview model name. 
    128 oldname = 'BarBellModel' 
    129 oldpars = dict(sld='sld_barbell', 
    130                sld_solvent='sld_solv', bell_radius='rad_bell', 
    131                radius='rad_bar', length='len_bar') 

  • sasmodels/models/bcc_paracrystal.py

    r02a0920 rec45c4f  
    137137    psi_pd=15, psi_pd_n=0, 
    138138    ) 
    139  
    140 # For testing against the old sasview models, include the converted parameter 
    141 # names and the target sasview model name. 
    142 oldname = 'BCCrystalModel' 
    143 oldpars = dict(sld='sldSph', sld_solvent='sldSolv') 

  • sasmodels/models/be_polyelectrolyte.py

    ra84a0ca rec45c4f  
    138138            polymer_concentration=0.7) 
    139139 
    140 oldname = "BEPolyelectrolyte" 
    141  
    142 oldpars = dict(background='background', 
    143                contrast_factor='k', 
    144                bjerrum_length='lb', 
    145                virial_param='h', 
    146                monomer_length='b', 
    147                salt_concentration='cs', 
    148                ionization_degree='alpha', 
    149                polymer_concentration='c') 
    150  
    151140tests = [ 
    152141 

  • sasmodels/models/binary_hard_sphere.py

    rd189429 rec45c4f  
    116116            volfraction_lg=0.1, volfraction_sm=0.2) 
    117117 
    118 # For testing against the old sasview models, include the converted parameter 
    119 # names and the target sasview model name. 
    120 oldname = 'BinaryHSModel' 
    121 oldpars = dict(volfraction_lg='vol_frac_ls', volfraction_sm='vol_frac_ss', 
    122                sld_lg='ls_sld', sld_sm='ss_sld', sld_solvent='solvent_sld', 
    123                radius_lg='l_radius', radius_sm='s_radius') 
    124  
    125118# NOTE: test results taken from values returned by SasView 3.1.2 
    126119tests = [[{}, 0.001, 25.8927262013]] 

  • sasmodels/models/broad_peak.py

    raad336c rec45c4f  
    107107            porod_scale=1.0e-05, porod_exp=3, 
    108108            lorentz_scale=10, lorentz_length=50, peak_pos=0.1, lorentz_exp=2) 
    109  
    110 oldname = "BroadPeakModel" 
    111 oldpars = dict(porod_scale='scale_p', porod_exp='exponent_p', 
    112                lorentz_scale='scale_l', lorentz_length='length_l', peak_pos='q_peak', 
    113                lorentz_exp='exponent_l', scale=None) 

  • sasmodels/models/capped_cylinder.py

    raa24114 rec45c4f  
    140140            theta_pd=15, theta_pd_n=45, 
    141141            phi_pd=15, phi_pd_n=1) 
    142 oldname = 'CappedCylinderModel' 
    143 oldpars = dict(sld='sld_capcyl', 
    144                sld_solvent='sld_solv', 
    145                length='len_cyl', 
    146                radius='rad_cyl', 
    147                cap_radius='rad_cap') 

  • sasmodels/models/core_multi_shell.py

    r6f0e04f rec45c4f  
    194194            sld_shell = [2.0], 
    195195            thick_shell = [10]) 
    196  
    197 oldname = "CoreMultiShellModel" 
    198 oldpars = dict( 
    199     sld="sld_core0", 
    200     radius="rad_core0", 
    201     sld_solvent="sld_solv", 
    202     n="n_shells", 
    203     sld_shell="sld_in_shell", 
    204     thick_shell="thick_shell", 
    205     # func_shell is always 2 in the user interface, so isn't included 
    206     ) 

  • sasmodels/models/core_shell_bicelle.py

    raad336c rec45c4f  
    102102            phi=0) 
    103103 
    104 oldname = 'CoreShellBicelleModel' 
    105  
    106 oldpars = dict(sld_core='core_sld', sld_face='face_sld', sld_rim='rim_sld', 
    107                sld_solvent='solvent_sld', rim_thickness='rim_thick', 
    108                face_thickness='face_thick', 
    109                theta='axis_theta', 
    110                phi='axis_phi') 
    111  
    112104qx, qy = 0.4 * cos(90), 0.5 * sin(0) 
    113105tests = [ 

  • sasmodels/models/core_shell_cylinder.py

    r43b7eea rec45c4f  
    158158            theta_pd=15, theta_pd_n=45, 
    159159            phi_pd=15, phi_pd_n=1) 
    160 oldname = 'CoreShellCylinderModel' 
    161 oldpars = dict( sld_core='core_sld', 
    162                sld_shell='shell_sld', 
    163                sld_solvent='solvent_sld', 
    164                theta='axis_theta', phi='axis_phi') 
    165160# ADDED by:  RKH  ON: 18Mar2016 renamed sld's etc 

  • sasmodels/models/core_shell_ellipsoid.py

    r27fade8 rec45c4f  
    137137            phi=0) 
    138138 
    139 oldname = 'CoreShellEllipsoidModel' 
    140  
    141 oldpars = dict(equat_core='equat_core',polar_core='polar_core',equat_shell='equat_shell',polar_shell='polar_shell', 
    142                sld_core='sld_core', 
    143                sld_shell='sld_shell', 
    144                sld_solvent='sld_solvent', 
    145                theta='axis_theta', 
    146                phi='axis_phi') 
    147  
    148139q = 0.1 
    149140phi = pi/6 

  • sasmodels/models/core_shell_ellipsoid_xt.py

    r27fade8 rec45c4f  
    124124            phi=0) 
    125125 
    126 oldname = 'CoreShellEllipsoidXTModel' 
    127  
    128 oldpars = dict(x_polar_shell='XpolarShell', 
    129                x_core='X_core', 
    130                t_shell='T_shell', 
    131                sld_core='sld_core', 
    132                sld_shell='sld_shell', 
    133                sld_solvent='sld_solvent', 
    134                theta='axis_theta', 
    135                phi='axis_phi') 
    136  
    137126q = 0.1 
    138127phi = pi/6 

  • sasmodels/models/core_shell_parallelepiped.py

    raad336c rec45c4f  
    176176            psi_pd=10, psi_pd_n=10) 
    177177 
    178  
    179 # For testing against the old sasview models, include the converted parameter 
    180 # names and the target sasview model name. 
    181 oldname = 'CSParallelepipedModel' 
    182 oldpars = dict(theta='parallel_theta', phi='parallel_phi', psi='parallel_psi', 
    183                sld_core='sld_pcore', sld_a='sld_rimA', sld_b='sld_rimB', 
    184                sld_c='sld_rimC', sld_solvent='sld_solv', 
    185                a_side='shortA', b_side='midB', c_side='longC', 
    186                arim_thickness='rimA', brim_thickness='rimB', crim_thickness='rimC') 
    187  
    188178qx, qy = 0.2 * np.cos(2.5), 0.2 * np.sin(2.5) 
    189179tests = [[{}, 0.2, 0.533149288477], 

  • sasmodels/models/core_shell_sphere.py

    r3c6d5bc rec45c4f  
    7474            sld_core=1.0, sld_shell=2.0, sld_solvent=0.0) 
    7575 
    76 oldname = 'CoreShellModel' 
    77 oldpars = dict( sld_core='core_sld', 
    78                sld_shell='shell_sld', 
    79                sld_solvent='solvent_sld') 
    80  
    8176def ER(radius, thickness): 
    8277    """ 

  • sasmodels/models/correlation_length.py

    r0cc31e1 rec45c4f  
    7575           ) 
    7676 
    77 # For testing against the old sasview models, include the converted parameter 
    78 # names and the target sasview model name. 
    79 oldname = 'CorrLengthModel' 
    80  
    81 oldpars = dict(lorentz_scale='scale_l', porod_scale='scale_p', 
    82                cor_length='length_l', exponent_p='exponent_p', 
    83                exponent_l='exponent_l') 
    84  
    8577tests = [[{}, 0.001, 1009.98], 
    8678         [{}, 0.150141, 0.175645], 

  • sasmodels/models/dab.py

    raa2edb2 rec45c4f  
    7676 
    7777demo = dict(scale=1, background=0, length=50) 
    78 oldname = "DABModel" 
    79 oldpars = dict(length='length') 

  • sasmodels/models/ellipsoid.py

    r3556ad7 rec45c4f  
    165165            theta_pd=15, theta_pd_n=45, 
    166166            phi_pd=15, phi_pd_n=1) 
    167 oldname = 'EllipsoidModel' 
    168 oldpars = dict(theta='axis_theta', phi='axis_phi', 
    169                sld='sldEll', sld_solvent='sldSolv', 
    170                r_polar='radius_a', r_equatorial='radius_b') 

  • sasmodels/models/elliptical_cylinder.py

    r0cc31e1 rec45c4f  
    110110            sld=4.0, sld_solvent=1.0, theta=10.0, phi=20, psi=30, theta_pd=10, phi_pd=2, psi_pd=3) 
    111111 
    112 oldname = 'EllipticalCylinderModel' 
    113 oldpars = dict(axis_ratio="r_ratio",theta='cyl_theta', phi='cyl_phi', psi='cyl_psi', sld='sldCyl', sld_solvent='sldSolv') 
    114  
    115112def ER(r_minor, axis_ratio, length): 
    116113    """ 

  • sasmodels/models/fcc_paracrystal.py

    r02a0920 rec45c4f  
    128128            psi_pd=15, psi_pd_n=0, 
    129129           ) 
    130  
    131 # For testing against the old sasview models, include the converted parameter 
    132 # names and the target sasview model name. 
    133 oldname = 'FCCrystalModel' 
    134 oldpars = dict(sld='sldSph', sld_solvent='sldSolv') 

  • sasmodels/models/flexible_cylinder.py

    rce8bed9 rec45c4f  
    9393            sld_solvent=6.3) 
    9494 
    95 oldname = 'FlexibleCylinderModel' 
    96 oldpars = dict(sld='sldCyl', sld_solvent='sldSolv') 
    97  
    98  
    9995tests = [ 
    10096    # Accuracy tests based on content in test/utest_other_models.py 

  • sasmodels/models/flexible_cylinder_elliptical.py

    r65bf704 rec45c4f  
    119119            sld_solvent=6.3) 
    120120 
    121 oldname = 'FlexCylEllipXModel' 
    122 oldpars = dict(sld='sldCyl', sld_solvent='sldSolv') 
    123  
    124  
    125121tests = [ 
    126122    # Accuracy tests based on content in test/utest_other_models.py 

  • sasmodels/models/fractal.py

    r5e29b9d rec45c4f  
    103103            sld_solvent=6.4) 
    104104 
    105 # For testing against the old sasview models, include the converted parameter 
    106 # names and the target sasview model name. 
    107 oldname = 'FractalModel' 
    108 oldpars = dict(radius='radius', 
    109                fractal_dim='fractal_dim', 
    110                cor_length='cor_length', 
    111                sld_block='sldBlock', 
    112                sld_solvent='sldSolv') 
    113  
    114105# NOTE: test results taken from values returned by SasView 3.1.2 
    115106tests = [ 

  • sasmodels/models/fractal_core_shell.py

    raad336c rec45c4f  
    8686            cor_length=100.0) 
    8787 
    88 oldname = 'FractalCoreShellModel' 
    89 oldpars = dict( sld_core='core_sld', 
    90                sld_shell='shell_sld', 
    91                sld_solvent='solvent_sld') 
    92  
    9388def ER(radius, thickness): 
    9489    """ 

  • sasmodels/models/fuzzy_sphere.py

    rd7028dc rec45c4f  
    120120            fuzziness_pd=.2, fuzziness_pd_n=0) 
    121121 
    122 oldname = "FuzzySphereModel" 
    123 oldpars = dict(sld='sldSph', sld_solvent='sldSolv', radius='radius', fuzziness='fuzziness') 
    124  
    125  
    126122tests = [ 
    127123    # Accuracy tests based on content in test/utest_models_new1_3.py 

  • sasmodels/models/gauss_lorentz_gel.py

    rb8954d7 rec45c4f  
    113113            dynamic_cor_length=20.0) 
    114114 
    115 oldname = "GaussLorentzGelModel" 
    116  
    117 oldpars = dict(background='background', 
    118                gauss_scale_factor='scale_g', 
    119                static_cor_length='stat_colength', 
    120                lorentz_scale_factor='scale_l', 
    121                dynamic_cor_length='dyn_colength') 
    122  
    123115tests = [ 
    124116 

  • sasmodels/models/gaussian_peak.py

    raa2edb2 rec45c4f  
    6767 
    6868demo = dict(scale=1, background=0, q0=0.05, sigma=0.005) 
    69 oldname = "PeakGaussModel" 
    70 oldpars = dict(sigma='B') 

  • sasmodels/models/gel_fit.py

    rb8954d7 rec45c4f  
    7878            cor_length=16.0) 
    7979 
    80 oldname = 'GelFitModel' 
    81 oldpars = dict(guinier_scale='gScale', 
    82                lorentzian_scale='lScale', 
    83                gyration_radius='radius', 
    84                fractal_exp='FractalExp', 
    85                cor_length='zeta') 
    86  
    8780tests = [[{'guinier_scale': 1.0, 
    8881           'lorentzian_scale': 1.0, 

  • sasmodels/models/guinier.py

    r45330ed rec45c4f  
    5353demo = dict(scale=1.0, rg=60.0) 
    5454 
    55 # For testing against the old sasview models, include the converted parameter 
    56 # names and the target sasview model name. 
    57 oldname = 'GuinierModel' 
    58 oldpars = dict(rg='rg') 
    59  
    6055# parameters for unit tests 
    6156tests = [[{'rg' : 31.5}, 0.005, 0.992756]] 

  • sasmodels/models/guinier_porod.py

    r45330ed rec45c4f  
    123123demo = dict(scale=1.5, background=0.5, rg=60, s=1.0, m=3.0) 
    124124 
    125 oldname = "GuinierPorodModel" 
    126 oldpars = dict(scale='scale', background='background', s='dim', m='m', rg='rg') 
    127  
    128125tests = [[{'scale': 1.5, 'background':0.5}, 0.04, 5.290096890253155]] 

  • sasmodels/models/hardsphere.py

    r934f906 rec45c4f  
    158158 
    159159demo = dict(radius_effective=200, volfraction=0.2, radius_effective_pd=0.1, radius_effective_pd_n=40) 
    160 oldname = 'HardsphereStructure' 
    161 oldpars = dict(radius_effective="effect_radius",radius_effective_pd="effect_radius_pd",radius_effective_pd_n="effect_radius_pd_n") 
    162160# Q=0.001 is in the Taylor series, low Q part, so add Q=0.1, assuming double precision sasview is correct 
    163161tests = [ 

  • sasmodels/models/hayter_msa.py

    ra3e0a8b rec45c4f  
    9494# VR defaults to 1.0 
    9595 
    96 oldname = 'HayterMSAStructure' 
    97 #oldpars = dict(effect_radius="radius_effective",effect_radius_pd="radius_effective_pd",effect_radius_pd_n="radius_effective_pd_n") 
    98 oldpars = dict(radius_effective="effect_radius",radius_effective_pd="effect_radius_pd",radius_effective_pd_n="effect_radius_pd_n",salt_concentration="saltconc") 
    99 #oldpars = dict( ) 
    10096# default parameter set,  use  compare.sh -midQ -linear 
    10197# note the calculation varies in different limiting cases so a wide range of 

  • sasmodels/models/hollow_cylinder.py

    r43b7eea rec45c4f  
    120120           ) 
    121121 
    122 # For testing against the old sasview models, include the converted parameter 
    123 # names and the target sasview model name. 
    124 oldname = 'HollowCylinderModel' 
    125 oldpars = dict(scale='scale', background='background', radius='radius', 
    126                core_radius='core_radius', sld='sldCyl', length='length', 
    127                sld_solvent='sldSolv', phi='axis_phi', theta='axis_theta') 
    128  
    129122# Parameters for unit tests 
    130123tests = [ 

  • sasmodels/models/hollow_rectangular_prism.py

    r3d8283b rec45c4f  
    154154            c2a_ratio_pd=0.1, c2a_ratio_pd_n=1) 
    155155 
    156 # For testing against the old sasview models, include the converted parameter 
    157 # names and the target sasview model name. 
    158 oldname = 'RectangularHollowPrismModel' 
    159 oldpars = dict(a_side='short_side', b2a_ratio='b2a_ratio', c_side='c2a_ratio', 
    160                thickness='thickness', sld='sldPipe', sld_solvent='sldSolv') 
    161  
    162156tests = [[{}, 0.2, 0.76687283098], 
    163157         [{}, [0.2], [0.76687283098]], 

  • sasmodels/models/hollow_rectangular_prism_thin_walls.py

    r3d8283b rec45c4f  
    133133            c2a_ratio_pd=0.1, c2a_ratio_pd_n=1) 
    134134 
    135 # For testing against the old sasview models, include the converted parameter 
    136 # names and the target sasview model name. 
    137 oldname = 'RectangularHollowPrismInfThinWallsModel' 
    138 oldpars = dict(a_side='short_side', b2a_ratio='b2a_ratio', c_side='c2a_ratio', 
    139                sld='sldPipe', sld_solvent='sldSolv') 
    140  
    141135tests = [[{}, 0.2, 0.837719188592], 
    142136         [{}, [0.2], [0.837719188592]], 

  • sasmodels/models/lamellar.py

    r7c391dd rec45c4f  
    9393            thickness=40, 
    9494            thickness_pd=0.2, thickness_pd_n=40) 
    95 oldname = 'LamellarModel' 
    96 oldpars = dict(sld='sld_bi', sld_solvent='sld_sol', thickness='bi_thick') 
    9795tests = [ 
    9896        [ {'scale': 1.0, 'background' : 0.0, 'thickness' : 50.0, 'sld' : 1.0,'sld_solvent' : 6.3, 'thickness_pd' : 0.0,  

  • sasmodels/models/lamellar_hg.py

    r52a3db3 rec45c4f  
    114114            head_length_pd=0.01, head_length_pd_n=40) 
    115115 
    116 oldname = 'LamellarFFHGModel' 
    117 oldpars = dict(head_length='h_thickness', tail_length='t_length', 
    118                sld='sld_tail', sld_head='sld_head', sld_solvent='sld_solvent') 
    119116# 
    120117tests = [[{'scale': 1.0, 'background': 0.0, 'tail_length': 15.0, 'head_length': 10.0, 

  • sasmodels/models/lamellar_hg_stack_caille.py

    r6ab4ed8 rec45c4f  
    138138    ) 
    139139 
    140 oldname = 'LamellarPSHGModel' 
    141  
    142 oldpars = dict( 
    143     tail_length='deltaT', head_length='deltaH', Nlayers='n_plates', 
    144     Caille_parameter='caille', sld='sld_tail', sld_head='sld_head', 
    145     sld_solvent='sld_solvent') 
    146140# 
    147141tests = [[{'scale': 1.0, 'background': 0.0, 'tail_length': 10.0, 'head_length': 2.0, 

  • sasmodels/models/lamellar_stack_caille.py

    r6ab4ed8 rec45c4f  
    117117            spacing_pd=0.05, spacing_pd_n=40) 
    118118 
    119 oldname = 'LamellarPSModel' 
    120 oldpars = dict(thickness='delta', Nlayers='N_plates', 
    121                Caille_parameter='caille', 
    122                sld='sld_bi', sld_solvent='sld_sol') 
    123119# 
    124120tests = [ 

  • sasmodels/models/lamellar_stack_paracrystal.py

    r6ab4ed8 rec45c4f  
    144144            thickness_pd=0.2, thickness_pd_n=40) 
    145145 
    146 oldname = 'LamellarPCrystalModel' 
    147 oldpars = dict(spacing_polydisp='pd_spacing', sld='sld_layer', 
    148                sld_solvent='sld_solvent') 
    149146# 
    150147tests = [ 

  • sasmodels/models/line.py

    ra84a0ca rec45c4f  
    7373demo = dict(scale=1.0, background=0, intercept=1.0, slope=1.0) 
    7474 
    75 oldname = "LineModel" 
    76 oldpars = dict(intercept='A', slope='B', background=None, scale=None) 
    77  
    7875tests = [ 
    7976 

  • sasmodels/models/linear_pearls.py

    ra2f9aa2 rec45c4f  
    7171            sld_solvent=6.3) 
    7272 
    73 oldname = "LinearPearlsModel" 
    74  
    75 oldpars = dict(edge_sep='edge_separation', 
    76                sld='sld_pearl', 
    77                sld_solvent='sld_solv') 
    78  
    7973""" 
    8074Tests temporarily disabled, until single-double precision accuracy issue solved. 

  • sasmodels/models/lorentz.py

    raa2edb2 rec45c4f  
    5555demo = dict(scale=1.0, background=0.0, cor_length=50.0) 
    5656 
    57 # For testing against the old sasview models, include the converted parameter 
    58 # names and the target sasview model name. 
    59 oldname = 'LorentzModel' 
    60 oldpars = dict(cor_length='length') 
    61  
    6257# parameters for unit tests 
    6358tests = [[{'cor_length': 250}, 0.01, 0.138931]] 

  • sasmodels/models/mass_fractal.py

    r95441ff rec45c4f  
    9292            cutoff_length=100.0) 
    9393 
    94 oldname = 'MassFractalModel' 
    95 oldpars = dict(radius='radius', 
    96                mass_dim='mass_dim', 
    97                cutoff_length='co_length') 
    98  
    9994tests = [ 
    10095 

  • sasmodels/models/mass_surface_fractal.py

    r95441ff rec45c4f  
    9898            primary_rg=4000.0) 
    9999 
    100 oldname = 'MassSurfaceFractal' 
    101 oldpars = dict(radius='radius', 
    102                mass_dim='mass_dim', 
    103                surface_dim='surface_dim', 
    104                cluster_rg='cluster_rg', 
    105                primary_rg='primary_rg') 
    106  
    107100tests = [ 
    108101 

  • sasmodels/models/mono_gauss_coil.py

    r6b4f7f6 rec45c4f  
    8181            background = 0.0) 
    8282 
    83 oldname =  "DebyeModel" 
    84 oldpars =  dict(scale = 'scale', 
    85                radius_gyration = 'rg', 
    86                background = 'background') 
    87  
    8883# these unit test values taken from SasView 3.1.2 
    8984tests =  [ 

  • sasmodels/models/multilayer_vesicle.py

    rd7028dc rec45c4f  
    9595            n_pairs=2.0) 
    9696 
    97 oldname = 'MultiShellModel' 
    98 oldpars = dict(radius='core_radius', 
    99                thick_shell='s_thickness', thick_solvent='w_thickness', 
    100                sld_solvent='core_sld', sld='shell_sld') 
    101  
    10297tests = [ 
    10398    # Accuracy tests based on content in test/utest_other_models.py 

  • sasmodels/models/onion.py

    rb0696e1 rec45c4f  
    385385    # "A[1]": 0, "A[2]": -1, "A[3]": 1e-4, "A[4]": 1, 
    386386    } 
    387  
    388 oldname = "OnionExpShellModel" 
    389 oldpars = dict( 
    390     core_sld="sld_core0", 
    391     core_radius="rad_core0", 
    392     solvent_sld="sld_solv", 
    393     n="n_shells", 
    394     in_sld="sld_in_shell", 
    395     out_sld="sld_out_shell", 
    396     A="A_shell", 
    397     thickness="thick_shell", 
    398     # func_shell is always 2 in the user interface, so isn't included 
    399     ) 

  • sasmodels/models/parallelepiped.py

    r76e5041 rec45c4f  
    222222            psi_pd=10, psi_pd_n=10) 
    223223 
    224 # For testing against the old sasview models, include the converted parameter 
    225 # names and the target sasview model name. 
    226 oldname = 'ParallelepipedModel' 
    227 oldpars = dict(theta='parallel_theta', phi='parallel_phi', psi='parallel_psi', 
    228                a_side='short_a', b_side='short_b', c_side='long_c', 
    229                sld='sldPipe', sld_solvent='sldSolv') 
    230  
    231  
    232224qx, qy = 0.2 * np.cos(2.5), 0.2 * np.sin(2.5) 
    233225tests = [[{}, 0.2, 0.17758004974], 

  • sasmodels/models/peak_lorentz.py

    raa2edb2 rec45c4f  
    7070            peak_pos=0.05, peak_hwhm=0.005) 
    7171 
    72 oldname = "PeakLorentzModel" 
    73 oldpars = dict(peak_pos='q0', peak_hwhm='B') 
    74  
    7572tests = [[{'scale':100.0, 'background':1.0}, 0.001, 2.0305]] 

  • sasmodels/models/pearl_necklace.py

    ra2f9aa2 rec45c4f  
    125125           ) 
    126126 
    127 # For testing against the old sasview models, include the converted parameter 
    128 # names and the target sasview model name. 
    129 oldname = 'PearlNecklaceModel' 
    130 oldpars = dict(scale='scale', background='background', radius='radius', 
    131                number_of_pearls='num_pearls', sld_solvent='sld_solv', 
    132                string_thickness='thick_string', sld='sld_pearl', 
    133                sld_string='sld_string', edge_separation='edge_separation') 
    134  
    135127tests = [[{}, 0.001, 17380.245], [{}, 'ER', 115.39502]] 

  • sasmodels/models/poly_gauss_coil.py

    r09b84ed rec45c4f  
    9494            background = 0.0) 
    9595 
    96 oldname =  "Poly_GaussCoil" 
    97 oldpars =  dict(scale = 'scale', 
    98                radius_gyration = 'rg', 
    99                polydispersity = 'poly_m', 
    100                background = 'background') 
    101  
    10296# these unit test values taken from SasView 3.1.2 
    10397tests =  [ 

  • sasmodels/models/polymer_excl_volume.py

    rbf59527 rec45c4f  
    154154            porod_exp=3.0) 
    155155 
    156 oldname = "PolymerExclVolume" 
    157 oldpars = dict(background='background', scale='scale', 
    158                rg='rg', 
    159                porod_exp='m') 
    160  
    161156tests = [ 
    162157    # Accuracy tests based on content in test/polyexclvol_default_igor.txt 

  • sasmodels/models/polymer_micelle.py

    r1e9a108 rec45c4f  
    6666 
    6767 
    68 oldname = 'MicelleSphCoreModel' 
    69 oldpars = dict(sld_solvent='rho_solv', 
    70                sld_core='rho_core', 
    71                sld_corona='rho_corona') 
    72  
    7368tests = [ 
    7469    [{}, 0.01, 15.3532], 

  • sasmodels/models/porod.py

    r2f63032 rec45c4f  
    5858demo = dict(scale=1.5, background=0.5) 
    5959 
    60 oldname = "PorodModel" 
    61 oldpars = dict(scale='scale', background='background') 
    62  
    6360tests = [[{'scale': 0.00001, 'background':0.01}, 0.04, 3.916250]] 

  • sasmodels/models/power_law.py

    raa2edb2 rec45c4f  
    5858            background=0.0) 
    5959 
    60 oldname = "PowerLawAbsModel" 
    61 oldpars = dict(scale='scale', 
    62                power='m', 
    63                background='background') 
    64  
    6560tests = [ 
    6661    [{'scale': 1.0, 'power': 4.0, 'background' : 0.0}, 

  • sasmodels/models/pringle.py

    r693570c rec45c4f  
    9393            sld_solvent=6.35) 
    9494 
    95 oldname = 'PringlesModel' 
    96 oldpars = dict(background='background', 
    97                scale='scale', 
    98                radius='radius', 
    99                thickness='thickness', 
    100                alpha='alpha', 
    101                beta='beta', 
    102                pringle_sld='sld_pringle', 
    103                solvent_sld='sld_solvent') 
    104  
    10595tests = [ 
    10696    [{'scale' : 1.0, 

  • sasmodels/models/raspberry.py

    r204fd9b rec45c4f  
    161161            radius_lg_pd=.2, radius_lg_pd_n=10) 
    162162 
    163 # For testing against the old sasview models, include the converted parameter 
    164 # names and the target sasview model name. 
    165  
    166163# TODO: update tests so the parameters correspond to SasView parameters 
    167164# The model was re-parameterized so the results have changed. 

  • sasmodels/models/rectangular_prism.py

    r76e5041 rec45c4f  
    131131            c2a_ratio_pd=0.1, c2a_ratio_pd_n=1) 
    132132 
    133 # For testing against the old sasview models, include the converted parameter 
    134 # names and the target sasview model name. 
    135 oldname = 'RectangularPrismModel' 
    136 oldpars = dict(a_side='short_side', b2a_ratio='b2a_ratio', c_side='c2a_ratio', 
    137                sld='sldPipe', sld_solvent='sldSolv') 
    138  
    139133tests = [[{}, 0.2, 0.375248406825], 
    140134         [{}, [0.2], [0.375248406825]], 

  • sasmodels/models/rpa.py

    raad336c rec45c4f  
    136136        return HIDE_NONE 
    137137 
    138 oldname = 'RPAModel' 
    139 oldpars = dict( 
    140     case_num="lcase_n", 
    141 ) 

  • sasmodels/models/sc_paracrystal.py

    r02a0920 rec45c4f  
    145145            psi=0.0) 
    146146 
    147 oldname = 'SCCrystalModel' 
    148  
    149 oldpars = dict(sld='sldSph', 
    150                sld_solvent='sldSolv') 
    151  
    152147tests = [ 
    153148    # Accuracy tests based on content in test/utest_extra_models.py 

  • sasmodels/models/sphere.py

    r364d8f7 rec45c4f  
    9696            radius=120, 
    9797            radius_pd=.2, radius_pd_n=45) 
    98 oldname = "SphereModel" 
    99 oldpars = dict(sld='sldSph', sld_solvent='sldSolv', radius='radius') 

  • sasmodels/models/spherical_sld.py

    r6f0e04f rec45c4f  
    197197    background=0.0, 
    198198    npts_inter=35.0, 
    199     ) 
    200  
    201 oldname = "SphereSLDModel" 
    202 oldpars = dict( 
    203     #scale="scale", 
    204     #background='background', 
    205     #n_shells="n_shells", 
    206     radius_core='rad_core', 
    207     #sld_core='sld_core', 
    208     #sld_flat='sld_flat', 
    209     #thick_flat='thick_flat', 
    210     #func_inter='func_inter', 
    211     #thick_inter='thick_inter', 
    212     #inter_nu='nu_inter', 
    213     #npts_inter='npts_inter', 
    214     sld_solvent='sld_solv', 
    215199    ) 
    216200 

  • sasmodels/models/squarewell.py

    rb812972 rec45c4f  
    130130# VR defaults to 1.0 
    131131 
    132 oldname = 'SquareWellStructure' 
    133 oldpars = dict(radius_effective="effect_radius",radius_effective_pd="effect_radius_pd",radius_effective_pd_n="effect_radius_pd_n") 
    134132demo = dict(radius_effective=50, volfraction=0.04, welldepth=1.5, 
    135133            wellwidth=1.2, radius_effective_pd=0, radius_effective_pd_n=0) 

  • sasmodels/models/stacked_disks.py

    r53215cf rec45c4f  
    155155            phi=0) 
    156156 
    157  
    158 oldname = 'StackedDisksModel' 
    159  
    160 oldpars = dict(sld_core='core_sld',sld_layer='layer_sld',sld_solvent='solvent_sld',n_stacking='n_stacking',theta='axis_theta', 
    161                phi='axis_phi') 
    162  
    163157tests = [ 
    164158    # Accuracy tests based on content in test/utest_extra_models.py. 

  • sasmodels/models/star_polymer.py

    r6b4f7f6 rec45c4f  
    6969            arms=3.0) 
    7070 
    71 oldname = 'StarPolymer' 
    72  
    73 oldpars = dict(rg_squared='R2', 
    74                arms='arms') 
    75  
    7671tests = [[{'rg_squared': 2.0, 
    7772           'arms':    3.3, 

  • sasmodels/models/stickyhardsphere.py

    r54954e1 rec45c4f  
    178178# VR defaults to 1.0 
    179179 
    180 oldname = 'StickyHSStructure' 
    181 oldpars = dict(radius_effective="effect_radius",radius_effective_pd="effect_radius_pd",radius_effective_pd_n="effect_radius_pd_n") 
    182180demo = dict(radius_effective=200, volfraction=0.2, perturb=0.05, 
    183181            stickiness=0.2, radius_effective_pd=0.1, radius_effective_pd_n=40) 

  • sasmodels/models/surface_fractal.py

    r95441ff rec45c4f  
    9292            radius=10, surface_dim=2.0, cutoff_length=500) 
    9393 
    94 oldname = 'SurfaceFractalModel' 
    95 oldpars = dict(radius='radius', 
    96                surface_dim='surface_dim', 
    97                cutoff_length='co_length') 
    98  
    9994tests = [ 
    10095    # Accuracy tests based on content in test/utest_other_models.py 

  • sasmodels/models/teubner_strey.py

    raa2edb2 rec45c4f  
    8484 
    8585demo = dict(scale=1, background=0, a2=0.1, c1=-30.0, c2=5000.0) 
    86 oldname = "TeubnerStreyModel" 
    87 oldpars = dict(a2='scale') 
    88  
    8986tests = [[{}, 0.2, 0.145927536232]] 

  • sasmodels/models/triaxial_ellipsoid.py

    r49da079 rec45c4f  
    124124            phi_pd=15, phi_pd_n=1, 
    125125            psi_pd=15, psi_pd_n=1) 
    126 oldname = 'TriaxialEllipsoidModel' 
    127 oldpars = dict(theta='axis_theta', phi='axis_phi', psi='axis_psi', 
    128                sld='sldEll', solvent_sld='sldSolv', 
    129                req_minor='semi_axisA', req_major='semi_axisB', 
    130                rpolar='semi_axisC') 

  • sasmodels/models/two_lorentzian.py

    rcaa7b4a rec45c4f  
    116116            lorentz_exp_2=2.0) 
    117117 
    118 oldname = "TwoLorentzianModel" 
    119 oldpars = dict(background='background', 
    120                lorentz_scale_1='scale_1', 
    121                lorentz_scale_2='scale_2', 
    122                lorentz_length_1='length_1', 
    123                lorentz_length_2='length_2', 
    124                lorentz_exp_1='exponent_1', 
    125                lorentz_exp_2='exponent_2') 
    126  
    127118tests = [ 
    128119 

  • sasmodels/models/two_power_law.py

    rc6652bb rec45c4f  
    123123            power_2=4.0) 
    124124 
    125 oldname = "TwoPowerLawModel" 
    126 oldpars = dict(coefficent_1='coef_A', 
    127                crossover='qc', 
    128                power_1='power1', 
    129                power_2='power2', 
    130                background='background') 
    131  
    132125tests = [ 
    133126    # Accuracy tests based on content in test/utest_extra_models.py 

  • sasmodels/models/vesicle.py

    r062db5a rec45c4f  
    128128            thickness_pd=.2, thickness_pd_n=10) 
    129129 
    130 # For testing against the old sasview models, include the converted parameter 
    131 # names and the target sasview model name. 
    132 oldname = 'VesicleModel' 
    133 oldpars = dict(sld='shell_sld', sld_solvent='solv_sld') 
    134  
    135  
    136130# NOTE: test results taken from values returned by SasView 3.1.2, with 
    137131# 0.001 added for a non-zero default background. 
Note: See TracChangeset for help on using the changeset viewer.