Changeset 88aa3ee in sasmodels


Ignore:
Timestamp:
Mar 21, 2016 2:12:43 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:
48fbd50, 3a45c2c
Parents:
445d1c0
Message:

again, with functional solution

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/core.py

    r445d1c0 r88aa3ee  
    222222    """ 
    223223    if mono: 
    224         active = set() 
     224        active = lambda name: False 
    225225    elif kernel.dim == '1d': 
    226         active = set(kernel.info['par_type']['1d']) 
     226        active = lambda name: name in set(kernel.info['par_type']['1d']) 
    227227    elif kernel.dim == '2d': 
    228         active = set(kernel.info['par_type']['2d']) 
    229     else: 
    230         vw_pairs = [get_weights(p, pars) for p in kernel.info['parameters']] 
    231  
    232     vw_pairs = [(get_weights(p, pars) if p.name in active else ([p.default], [1])) 
     228        active = lambda name: name in set(kernel.info['par_type']['2d']) 
     229    else: 
     230        active = lambda name: True 
     231 
     232    vw_pairs = [(get_weights(p, pars) if active(p.name) else ([p.default], [1])) 
    233233                for p in kernel.info['parameters']] 
    234234    values, weights = zip(*vw_pairs) 
Note: See TracChangeset for help on using the changeset viewer.