Changeset 0b8a1fc in sasmodels for explore/beta/sasfit_compare_new.py


Ignore:
Timestamp:
Mar 27, 2019 6:57:52 AM (5 years ago)
Author:
richardh
Branches:
master, ticket-1257-vesicle-product, ticket_1156, ticket_822_more_unit_tests
Children:
facb052
Parents:
d8b7efa
Message:

progressing towards unit test with S(Q)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • explore/beta/sasfit_compare_new.py

    rd8b7efa r0b8a1fc  
    595595#       this one is only used locally for "actual" 
    596596        ) 
    597     target = sasmodels_theory(q, model, effective_radius_type=0, structure_factor_type=1, **pars) 
     597    target = sasmodels_theory(q, model, effective_radius_type=0, structure_factor_mode=1, **pars) 
    598598    actual = sphere_r(q, norm='sasview', **pars) 
    599599    title = " ".join(("sasmodels", model, pd_type)) 
    … …  
    615615        # equivalent average sphere radius for local "actual" to match what sasview uses, use None to compute average outer radius here, 
    616616 
    617     target = sasmodels_theory(q, model, effective_radius_type=0, structure_factor_type=1, **pars) 
     617    target = sasmodels_theory(q, model, effective_radius_type=0, structure_factor_mode=1, **pars) 
    618618    actual = vesicle_pe(q, norm='sasview', **pars) 
    619619    title = " ".join(("sasmodels", model, pd_type)) 
    … …  
    635635        radius_effective=40.687)   
    636636        # equivalent average sphere radius for local "actual" to match what sasview uses 
    637     target = sasmodels_theory(q, model, effective_radius_type=0, structure_factor_type=1, **pars) 
     637    target = sasmodels_theory(q, model, effective_radius_type=0, structure_factor_mode=1, **pars) 
    638638    actual = hollow_cylinder_pe(q, norm='sasview', **pars) 
    639639# RKH monodisp was OK,    actual = hollow_cylinder_theta(q,radius=20, thickness=10, length=80, sld=4, sld_solvent=1 ) 
    … …  
    656656# if change radius_effective to some other value, the S(Q) from sasview does not agree 
    657657        ) 
    658     target = sasmodels_theory(q, model, effective_radius_type=0, structure_factor_type=1, **pars) 
     658    target = sasmodels_theory(q, model, effective_radius_type=0, structure_factor_mode=1, **pars) 
    659659    actual = ellipsoid_pe(q, norm='sasview', **pars) 
    660660# RKH test       actual = ellipsoid_theta(q, radius_polar=20, radius_equatorial=400, sld=4, sld_solvent=1, volfraction=0.15, radius_effective=270.) 
Note: See TracChangeset for help on using the changeset viewer.