Changeset 6dc78e4 in sasmodels for sasmodels/details.py

Timestamp:

Aug 17, 2016 5:12:51 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

deb854f, 300a2f7

Parents:

6b7e2f7

Message:

re-enable structure factor product

File:

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

sasmodels/details.py

@@ -177 +177 @@
 
 def make_details(model_info, length, offset, num_weights):
+    # type: (ModelInfo, np.ndarray, np.ndarray, int) -> CallDetails
     """
     Return a :class:`CallDetails` object for a polydisperse calculation
@@ -186 +187 @@
     array.
     """
-    # type: (ModelInfo, np.ndarray, np.ndarray, int) -> CallDetails
     #pars = model_info.parameters.call_parameters[2:model_info.parameters.npars+2]
     #print(", ".join(str(i)+"-"+p.id for i,p in enumerate(pars)))
@@ -275 +275 @@
     """
     value, weight = zip(*pars)
-    weight = [w if w else [1.] for w in weight]
+    #weight = [w if len(w)>0 else [1.] for w in weight]
     weight = np.vstack([v.flatten() for v in meshgrid(*weight)])
     weight = np.prod(weight, axis=0)