Changeset 52ec91e in sasmodels


Ignore:
Timestamp:
Sep 8, 2016 3:51:20 PM (8 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:
424fe00, 58c3367, 9c1a59c, d8f22db, 6f89000
Parents:
1875f4e
Message:

use consistent pattern for units names: g/cm3, mg/m2

Location:
sasmodels
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/generate.py

    r0dc34c3 r52ec91e  
    218218    "1/cm": "|cm^-1|", 
    219219    "Ang/cm": "|Ang*cm^-1|", 
    220     "g/cm3": "|g/cm^3|", 
    221     "mg/m2": "|mg/m^2|", 
     220    "g/cm^3": "|g/cm^3|", 
     221    "mg/m^2": "|mg/m^2|", 
    222222    "": "None", 
    223223    } 

  • sasmodels/models/adsorbed_layer.py

    r40a87fa r52ec91e  
    6868parameters = [ 
    6969    ["second_moment", "Ang", 23.0, [0.0, inf], "", "Second moment of polymer distribution"], 
    70     ["adsorbed_amount", "mg/m2", 1.9, [0.0, inf], "", "Adsorbed amount of polymer"], 
    71     ["density_shell", "g/cm3", 0.7, [0.0, inf], "", "Bulk density of polymer in the shell"], 
     70    ["adsorbed_amount", "mg/m^2", 1.9, [0.0, inf], "", "Adsorbed amount of polymer"], 
     71    ["density_shell", "g/cm^3", 0.7, [0.0, inf], "", "Bulk density of polymer in the shell"], 
    7272    ["radius", "Ang", 500.0, [0.0, inf], "", "Core particle radius"], 
    7373    ["volfraction", "None", 0.14, [0.0, inf], "", "Core particle volume fraction"], 
Note: See TracChangeset for help on using the changeset viewer.