Changeset 0bef47b in sasmodels


Ignore:
Timestamp:
Sep 29, 2016 9:43:55 PM (8 years ago)
Author:
butler
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:
6e5b2a7
Parents:
340428e
Message:

Standarizing model naming - closes #650

Location:
sasmodels/models
Files:
8 edited
8 moved

Legend:

Unmodified
Added
Removed

  • sasmodels/models/bcc_paracrystal.py

    r42356c8 r0bef47b  
    124124# pylint: enable=bad-whitespace, line-too-long 
    125125 
    126 source = ["lib/sph_j1c.c", "lib/gauss150.c", "lib/sphere_form.c", "bcc_paracrystal_kernel.c"] 
     126source = ["lib/sph_j1c.c", "lib/gauss150.c", "lib/sphere_form.c", "bcc_paracrystal.c"] 
    127127 
    128128# parameters for demo 

  • sasmodels/models/fcc_paracrystal.py

    r42356c8 r0bef47b  
    116116# pylint: enable=bad-whitespace, line-too-long 
    117117 
    118 source = ["lib/sph_j1c.c", "lib/gauss150.c", "lib/sphere_form.c", "fcc_paracrystal_kernel.c"] 
     118source = ["lib/sph_j1c.c", "lib/gauss150.c", "lib/sphere_form.c", "fcc_paracrystal.c"] 
    119119 
    120120# parameters for demo 

  • sasmodels/models/hayter_msa.py

    r40a87fa r0bef47b  
    8181# pylint: enable=bad-whitespace, line-too-long 
    8282 
    83 source = ["hayter_msa_kernel.c"] 
     83source = ["hayter_msa.c"] 
    8484# No volume normalization despite having a volume parameter 
    8585# This should perhaps be volume normalized? 

  • sasmodels/models/lamellar_hg_stack_caille.py

    r40a87fa r0bef47b  
    112112    ] 
    113113 
    114 source = ["lamellar_hg_stack_caille_kernel.c"] 
     114source = ["lamellar_hg_stack_caille.c"] 
    115115 
    116116# No volume normalization despite having a volume parameter 

  • sasmodels/models/lamellar_stack_caille.py

    r40a87fa r0bef47b  
    9696# pylint: enable=bad-whitespace, line-too-long 
    9797 
    98 source = ["lamellar_stack_caille_kernel.c"] 
     98source = ["lamellar_stack_caille.c"] 
    9999 
    100100# No volume normalization despite having a volume parameter 

  • sasmodels/models/lamellar_stack_paracrystal.py

    r40a87fa r0bef47b  
    126126 
    127127 
    128 source = ["lamellar_stack_paracrystal_kernel.c"] 
     128source = ["lamellar_stack_paracrystal.c"] 
    129129 
    130130form_volume = """ 

  • sasmodels/models/polymer_micelle.py

    r40a87fa r0bef47b  
    5454single = False 
    5555 
    56 source = ["lib/sph_j1c.c", "polymer_micelle_kernel.c"] 
     56source = ["lib/sph_j1c.c", "polymer_micelle.c"] 
    5757 
    5858demo = dict(scale=1, background=0, 

  • sasmodels/models/sc_paracrystal.py

    r42356c8 r0bef47b  
    133133# pylint: enable=bad-whitespace, line-too-long 
    134134 
    135 source = ["lib/sph_j1c.c", "lib/sphere_form.c", "lib/gauss150.c", "sc_paracrystal_kernel.c"] 
     135source = ["lib/sph_j1c.c", "lib/sphere_form.c", "lib/gauss150.c", "sc_paracrystal.c"] 
    136136 
    137137demo = dict(scale=1, background=0, 
Note: See TracChangeset for help on using the changeset viewer.