Changeset 117c02a in sasmodels for sasmodels/sasview_model.py

Timestamp:

Sep 3, 2018 7:20:35 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:

c0131d44

Parents:

bad3093

Message:

cherry-picking lazy results implementation from beta_approx_lazy_results, beta_approx_new_R_eff branches

File:

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

sasmodels/sasview_model.py

@@ -381 +381 @@
                 continue
             self.params[p.name] = p.default
-            self.details[p.id] = [p.units, p.limits[0], p.limits[1]]
+            if p.limits is not None:
+                self.details[p.id] = [p.units if not p.choices else p.choices, p.limits[0], p.limits[1]]
+            else:
+                self.details[p.id] = [p.units if not p.choices else p.choices, None, None]
             if p.polydisperse:
                 self.details[p.id+".width"] = [
@@ -616 +619 @@
         # 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 +641 @@
             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