Changeset eb3fab6 in sasmodels

Timestamp:

Oct 25, 2017 8:40:50 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:

89d530c

Parents:

55d88b4

Message:

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

File:

• sasmodels/sasview_model.py (modified) (1 diff)

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()