Changeset 7b68dc5 in sasmodels


Ignore:
Timestamp:
Sep 12, 2016 1:31:16 AM (5 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:
6592f56
Parents:
7e6bea81
Message:

core_multi_shell, onion: convert multiplicity to integer to avoid warnings

Location:
sasmodels/models
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/core_multi_shell.py

    r8c6fbbc r7b68dc5  
    132132def ER(radius, n, thickness): 
    133133    """Effective radius""" 
    134     n = n[0]  # n cannot be polydisperse 
     134    n = int(n[0])  # n cannot be polydisperse 
    135135    return np.sum(thickness[:n], axis=0) + radius 
    136136 
  • sasmodels/models/onion.py

    r3cd1001 r7b68dc5  
    368368def ER(core_radius, n, thickness): 
    369369    """Effective radius""" 
    370     return np.sum(thickness[:n[0]], axis=0) + core_radius 
     370    return np.sum(thickness[:int(n[0])], axis=0) + core_radius 
    371371 
    372372demo = { 
Note: See TracChangeset for help on using the changeset viewer.