Changeset 7ae2b7f in sasmodels for sasmodels/product.py

Timestamp:

Apr 11, 2016 12:48:41 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:

fa5fd8d

Parents:

f619de7

Message:

still more linting; ignore numpy types

File:

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

sasmodels/product.py

@@ -11 +11 @@
 *ProductModel(P, S)*.
 """
-import numpy as np
+import numpy as np  # type: ignore
 
 from .details import dispersion_mesh
@@ -109 +109 @@
         effect_radius, vol_ratio = call_ER_VR(self.p_kernel.info, vol_pars)
 
-        p_fixed[SCALE] = s_volfraction
-        p_fixed[BACKGROUND] = 0.0
-        s_fixed[SCALE] = scale
-        s_fixed[BACKGROUND] = 0.0
-        s_fixed[2] = s_volfraction/vol_ratio
-        s_pd[0] = [effect_radius], [1.0]
-
-        p_res = self.p_kernel(p_details, p_weights, p_values, cutoff)
-        s_res = self.s_kernel(s_details, s_weights, s_values, cutoff)
+        p_details, s_details = details.parts
+        p_res = self.p_kernel(p_details, weights, values, cutoff)
+        s_res = self.s_kernel(s_details, weights, values, cutoff)
         #print s_fixed, s_pd, p_fixed, p_pd
 
-        return p_res*s_res + background
+        return values[0]*(p_res*s_res) + values[1]
 
     def release(self):