Changeset 8e0d974 in sasmodels

Timestamp:

Mar 21, 2016 6:21:23 AM (9 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:

76e5041

Parents:

5430333

Message:

product model was not forwarding cutoff to S and P

Location:

sasmodels

Files:

• kernelcl.py (modified) (1 diff)
• product.py (modified) (1 diff)

sasmodels/kernelcl.py

@@ -426 +426 @@
         self._need_release = [self.loops_b, self.res_b, self.q_input]
 
-    def __call__(self, fixed_pars, pd_pars, cutoff=1e-5):
+    def __call__(self, fixed_pars, pd_pars, cutoff):
         real = (np.float32 if self.q_input.dtype == generate.F32
                 else np.float64 if self.q_input.dtype == generate.F64

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