Changeset 2773c66 in sasmodels for sasmodels/product.py

Timestamp:

Sep 8, 2018 8:29:05 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:

ba51e00

Parents:

b763f9d (diff), c88f983 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'beta_approx' into beta_approx_new_R_eff

File:

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

sasmodels/product.py

@@ -42 +42 @@
     pars = []
     if p_info.have_Fq:
-        par = parse_parameter("structure_factor_mode", "", 0, [["P*S","P*(1+beta*(S-1))"]], "",
-                        "Structure factor calculation")
+        par = parse_parameter(
+                "structure_factor_mode",
+                "",
+                0,
+                [["P*S","P*(1+beta*(S-1))"]],
+                "",
+                "Structure factor calculation")
         pars.append(par)
     if p_info.effective_radius_type is not None:
-        par = parse_parameter("radius_effective_mode", "", 0, [["unconstrained"] + p_info.effective_radius_type], "",
-                        "Effective radius calculation")
+        par = parse_parameter(
+                "radius_effective_mode",
+                "",
+                0,
+                [["unconstrained"] + p_info.effective_radius_type],
+                "",
+                "Effective radius calculation")
         pars.append(par)
     return pars
@@ -169 +179 @@
     ))
 
-def _intermediates_beta(F1, F2, S, scale, bg, effective_radius):
-    # type: (np.ndarray, np.ndarray, np.ndarray, np.ndarray, np.ndarray, float) -> OrderedDict[str, Union[np.ndarray, float]]
+def _intermediates_beta(F1,              # type: np.ndarray
+                        F2,              # type: np.ndarray
+                        S,               # type: np.ndarray
+                        scale,           # type: np.ndarray
+                        bg,              # type: np.ndarray
+                        effective_radius # type: float
+                        ):
+    # type: (...) -> OrderedDict[str, Union[np.ndarray, float]]
     """
     Returns intermediate results for beta approximation-enabled product. The result may be an array or a float.