Changeset d32de68 in sasmodels for sasmodels/sasview_model.py

Timestamp:

Aug 21, 2018 2:43:34 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

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

Children:

c11d09f

Parents:

d3ffeb7

Message:

put intermediate results into helper functions; tidy up; retain sasview 4.3 support in returning P(Q), S(Q)

File:

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

sasmodels/sasview_model.py

@@ -616 +616 @@
         # so that it returns a results object containing all the bits:
         #     the A, B, C, ... of the composition model (and any subcomponents?)
-        #     the P and S of the product model,
+        #     the P and S of the product model
         #     the combined model before resolution smearing,
         #     the sasmodel before sesans conversion,
@@ -638 +638 @@
             with calculation_lock:
                 self._calculate_Iq(qx)
-                return self._intermediate_results
+                # for compatibility with sasview 4.3
+                results = self._intermediate_results()
+                return results["P(Q)"], results["S(Q)"]
         else:
             return None