Changeset eb3fab6 in sasmodels


Ignore:
Timestamp:
Oct 25, 2017 8:40:50 AM (21 months ago)
Author:
Gonzalez, Miguel <gonzalez@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
89d530c
Parents:
55d88b4
Message:

Fix interface problem appearing when a form factor that has multiplicity is combined with a structure factor

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/sasview_model.py

    r9f8ade1 reb3fab6  
    205205                                           structure_factor._model_info) 
    206206    ConstructedModel = make_model_from_info(model_info) 
     207    if form_factor.is_multiplicity_model: 
     208        ConstructedModel.is_multiplicity_model = True 
     209        ConstructedModel.multiplicity_info = form_factor.multiplicity_info 
     210        ConstructedModel.non_fittable = form_factor.non_fittable 
     211        return ConstructedModel(form_factor.multiplicity) 
     212    else: 
     213        return ConstructedModel() 
    207214    return ConstructedModel() 
    208215 
Note: See TracChangeset for help on using the changeset viewer.