Changeset 4b0e1f3 in sasmodels


Ignore:
Timestamp:
Mar 14, 2016 6:34:58 AM (4 years ago)
Author:
smk78
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:
56fac50
Parents:
41c7e68 (diff), bea7acb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of https://github.com/SasView/sasmodels

Conflicts:

sasmodels/generate.py

Files:
3 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • doc/rst_prolog

    re58bd7a r4b0e1f3  
    5050.. |cm^-2| replace:: cm\ :sup:`-2` 
    5151.. |cm^3| replace:: cm\ :sup:`3` 
     52.. |1e15cm^3| replace:: 10\ :sup:`15`\ cm\ :sup:`3` 
    5253.. |cm^-3| replace:: cm\ :sup:`-3` 
    5354.. |sr^-1| replace:: sr\ :sup:`-1` 
  • sasmodels/convert.py

    r7d4b2ae r0d0aee1  
    5252    new model definition end with sld. 
    5353    """ 
    54     return dict((p, (v*1e6 if p.endswith('sld') else v)) 
     54    return dict((p, (v*1e6 if p.endswith('sld') else v*1e-15 if 'ndensity' in p else v)) 
    5555                for p, v in pars.items()) 
    5656 
     
    7070    new model definition end with sld. 
    7171    """ 
    72     return dict((p, (v*1e-6 if p.endswith('sld') else v)) 
     72    return dict((p, (v*1e-6 if p.endswith('sld') else v*1e15 if 'ndensity' in p else v)) 
    7373                for p, v in pars.items()) 
    7474 
  • sasmodels/models/adsorbed_layer.py

    r41c7e68 r4b0e1f3  
    6161    denominator =  (q * q) * (density_poly * density_poly) * radius 
    6262    eterm =  exp(-1.0 * (q * q) * (second_moment * second_moment)) 
    63     inten =  deltarhosqrd * ((numerator / denominator) * eterm) 
    6463    #scale by 10^10 for units conversion to cm^-1 
    65     return inten * 1.0e+10 
     64    inten =  1.0e+10 * deltarhosqrd * ((numerator / denominator) * eterm) 
     65    return inten * 9.4e-13 
    6666Iq.vectorized =  True  # Iq accepts an array of q values 
    6767 
Note: See TracChangeset for help on using the changeset viewer.