Changeset d3ffeb7 in sasmodels

Timestamp:

Aug 20, 2018 11:16:06 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:

d32de68

Parents:

bad3093

Message:

beta_mode takes choices from units; lazy results implementation

Location:

sasmodels

Files:

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

sasmodels/product.py

@@ -37 +37 @@
 ER_ID = "radius_effective"
 VF_ID = "volfraction"
-BETA_DEFINITION = ("beta_mode", "", 0, [["P*S"],["P*(1+beta*(S-1))"]], "",
+BETA_DEFINITION = ("beta_mode", ["P*S", "P*(1+beta*(S-1))"], 0, (None, None), "",
                    "Structure factor dispersion calculation mode")
 
@@ -294 +294 @@
             #    }
             #lazy_pars = s_result, F1, F2, combined_scale
-            self.results = [F2*volfrac/volume_avg, s_result]
+
+            # self.results = [F2*volfrac/volume_avg, s_result]
             final_result = combined_scale*(F2 + (F1**2)*(s_result - 1)) + background
+
+            # TODO: 1. include calculated Q vector
+            # TODO: 2. consider implications if there are intermediate results in P(Q)
+            # def lazy(F1, F2, S, scale, bg):
+            def lazy(F1, F2, S, scale):
+                return {
+                    "P(Q)": lambda: scale*F2,
+                    "S(Q)": lambda: S,
+                    "beta(Q)": lambda: F1**2 / F2,
+                    "S_eff(Q)": lambda: 1 + (F1**2 / F2)*(S-1),
+                    # "I(Q)":  lambda: scale*(F2 + (F1**2)*(S-1)) + bg,
+                }
+
+            self.results = lazy(F1, F2, s_result, volfrac/volume_avg)
+
         else:
             p_result = self.p_kernel.Iq(p_details, p_values, cutoff, magnetic)
             # remember the parts for plotting later
-            self.results = [p_result, s_result]
+            # self.results = [p_result, s_result]
             final_result = scale*(p_result*s_result) + background
+
+            def lazy(P, S):
+                return {
+                    "P(Q)": lambda: P,
+                    "S(Q)": lambda: S,
+                }
+
+            self.results = lazy(p_result, s_result)
 
         #call_details.show(values)

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]]
+            self.details[p.id] = [p.units if not p.choices else p.choices, p.limits[0], p.limits[1]]
             if p.polydisperse:
                 self.details[p.id+".width"] = [