Changeset 15c80af in sasmodels


Ignore:
Timestamp:
Jan 29, 2019 11:26:26 AM (3 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
b171acd
Parents:
d61465c
Message:

propagate first multiplicity parameter to sum model. Refs #1022.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/mixture.py

    recf895e r15c80af  
    3434    # Build new parameter list 
    3535    combined_pars = [] 
     36    control = None 
    3637 
    3738    all_parts = copy(parts) 
     
    116117                p.length_control = prefix + p.length_control 
    117118            combined_pars.append(p) 
     119            if p.is_control and control is None: 
     120                control = p.id 
    118121    parameters = ParameterTable(combined_pars) 
    119122    parameters.max_pd = sum(part.parameters.max_pd for part in parts) 
     
    129132    model_info = ModelInfo() 
    130133    model_info.id = operation.join(part.id for part in parts) 
     134    model_info.control = control 
    131135    model_info.operation = operation 
    132136    model_info.name = '(' + operation.join(part.name for part in parts) + ')' 
Note: See TracChangeset for help on using the changeset viewer.