Changeset 9644b5a in sasmodels

Timestamp:

Sep 12, 2017 12:28:09 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c

Parents:

946c8d27

Message:

avoid recalculation of components unless it is a P@S product model

File:

• sasmodels/sasview_model.py (modified) (3 diffs)

sasmodels/sasview_model.py

@@ -609 +609 @@
         # Long term, the solution is to change the interface to calculate_Iq
         # so that it returns a results object containing all the bits:
-        #     the A, B, C, ... of the composition model
+        #     the A, B, C, ... of the composition model (and any subcomponents?)
         #     the P and S of the product model,
         #     the combined model before resolution smearing,
@@ -616 +616 @@
         #     the final I(q),
         #     ...
+        #
         # Have the model calculator add all of these blindly to the data
         # tree, and update the graphs which contain them.  The fitter
@@ -627 +628 @@
         # after q max.  Both of these should be addressed before
         # replacing this code.
-        with calculation_lock:
-            self._calculate_Iq(qx)
-            return self._intermediate_results
+        composition = self._model_info.composition
+        if composition and composition[0] == 'product': # only P*S for now
+            with calculation_lock:
+                self._calculate_Iq(qx)
+                return self._intermediate_results
+        else:
+            return None
 
     def calculate_Iq(self, qx, qy=None):