Changeset 790bcc4c in sasmodels for sasmodels/convert.py


Ignore:
Timestamp:
Jan 21, 2016 12:47:29 AM (8 years ago)
Author:
piotr
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, 55b283e8
Parents:
9c461c7 (diff), 6458608 (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 remote-tracking branch 'origin/master'

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/convert.py

    r30b4ddf r6458608  
    7575    for new, old in mapping.items(): 
    7676        for pd, dot in PD_DOT: 
    77             if old+pd == new+dot: 
     77            if old and old+pd == new+dot: 
    7878                continue 
    7979            if new+pd in newpars: 
Note: See TracChangeset for help on using the changeset viewer.