Changeset e9b1663d in sasmodels for sasmodels/product.py

Timestamp:

Mar 23, 2016 1:02:10 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:

76a9ffe

Parents:

69aa451 (diff), 34edbb8 (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:

pull from master

File:

• sasmodels/product.py (modified) (1 diff)

sasmodels/product.py

@@ -163 +163 @@
         s_pd[0] = [effect_radius], [1.0]
 
-        p_res = self.p_kernel(p_fixed, p_pd)
-        s_res = self.s_kernel(s_fixed, s_pd)
+        p_res = self.p_kernel(p_fixed, p_pd, cutoff)
+        s_res = self.s_kernel(s_fixed, s_pd, cutoff)
         #print s_fixed, s_pd, p_fixed, p_pd