Changeset 1f35235 in sasmodels


Ignore:
Timestamp:
Oct 27, 2017 11:21:26 AM (5 years 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:
439ffcd, 3a45c2c
Parents:
89d530c
Message:

Fixing the issue using the control attribute in make_product_info

Location:
sasmodels
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/product.py

    r058460c r1f35235  
    100100    # Remember the component info blocks so we can build the model 
    101101    model_info.composition = ('product', [p_info, s_info]) 
     102    model_info.control = p_info.control 
    102103    # TODO: delegate random to p_info, s_info 
    103104    #model_info.random = lambda: {} 
  • sasmodels/sasview_model.py

    r89d530c r1f35235  
    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() 
     207    return ConstructedModel(form_factor.multiplicity)     
    214208 
    215209 
     
    329323    #: True if model has multiplicity 
    330324    is_multiplicity_model = False 
    331     #: Mulitplicity information 
     325    #: Multiplicity information 
    332326    multiplicity_info = None # type: MultiplicityInfoType 
    333327 
     
    360354        # and lines to plot. 
    361355 
    362         # Get the list of hidden parameters given the mulitplicity 
     356        # Get the list of hidden parameters given the multiplicity 
    363357        # Don't include multiplicity in the list of parameters 
    364358        self.multiplicity = multiplicity 
Note: See TracChangeset for help on using the changeset viewer.