Changeset 1f35235 in sasmodels

Timestamp:

Oct 27, 2017 11:21:26 AM (7 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:

• product.py (modified) (1 diff)
• sasview_model.py (modified) (3 diffs)

sasmodels/product.py

@@ -100 +100 @@
     # Remember the component info blocks so we can build the model
     model_info.composition = ('product', [p_info, s_info])
+    model_info.control = p_info.control
     # TODO: delegate random to p_info, s_info
     #model_info.random = lambda: {}

sasmodels/sasview_model.py

@@ -205 +205 @@
                                            structure_factor._model_info)
     ConstructedModel = make_model_from_info(model_info)
-    if form_factor.is_multiplicity_model:
-        ConstructedModel.is_multiplicity_model = True
-        ConstructedModel.multiplicity_info = form_factor.multiplicity_info
-        ConstructedModel.non_fittable = form_factor.non_fittable
-        return ConstructedModel(form_factor.multiplicity)
-    else:
-        return ConstructedModel()
+    return ConstructedModel(form_factor.multiplicity)    
 
 
@@ -329 +323 @@
     #: True if model has multiplicity
     is_multiplicity_model = False
-    #: Mulitplicity information
+    #: Multiplicity information
     multiplicity_info = None # type: MultiplicityInfoType
 
@@ -360 +354 @@
         # and lines to plot.
 
-        # Get the list of hidden parameters given the mulitplicity
+        # Get the list of hidden parameters given the multiplicity
         # Don't include multiplicity in the list of parameters
         self.multiplicity = multiplicity