Changes in / [bd36af0:ef969d9] in sasmodels


Ignore:
Location:
sasmodels
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/product.py

    redb0f85 r1f35235  
    101101    model_info.composition = ('product', [p_info, s_info]) 
    102102    model_info.control = p_info.control 
    103     model_info.hidden = p_info.hidden 
    104     if getattr(p_info, 'profile', None) is not None: 
    105         profile_pars = set(p.id for p in p_info.parameters.kernel_parameters) 
    106         def profile(**kwargs): 
    107             # extract the profile args 
    108             kwargs = dict((k, v) for k, v in kwargs.items() if k in profile_pars) 
    109             return p_info.profile(**kwargs) 
    110     else: 
    111         profile = None 
    112     model_info.profile = profile 
    113     model_info.profile_axes = p_info.profile_axes 
    114  
    115103    # TODO: delegate random to p_info, s_info 
    116104    #model_info.random = lambda: {} 
  • sasmodels/sasview_model.py

    redb0f85 r1f35235  
    205205                                           structure_factor._model_info) 
    206206    ConstructedModel = make_model_from_info(model_info) 
    207     return ConstructedModel(form_factor.multiplicity) 
     207    return ConstructedModel(form_factor.multiplicity)     
    208208 
    209209 
Note: See TracChangeset for help on using the changeset viewer.