Changeset 3c56da87 in sasmodels for sasmodels/sesans.py

Timestamp:

Mar 5, 2015 12:55:38 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:

3a45c2c

Parents:

b89f519

Message:

lint cleanup

File:

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

sasmodels/sesans.py

@@ -22 +22 @@
 # TODO: dead code; for now the call to the hankel transform happens in BumpsModel
 class SesansCalculator:
-    def __init__(self, sans_kernel, q_zmax, Rmax, SElength, wavelength, thickness):
-        self._set_kernel(sans_kernel, q_zmax, Rmax)
+    def __init__(self, kernel, q_zmax, Rmax, SElength, wavelength, thickness):
+        self._set_kernel(kernel, q_zmax, Rmax)
         self.SElength = SElength
         self.wavelength = wavelength
         self.thickness = thickness
 
-    def _set_kernel(self, sans_kernel, q_zmax, Rmax):
-        input = sans_kernel.make_input([make_q(q_zmax, Rmax)])
-        self.sans_calculator = sans_kernel(input)
+    def _set_kernel(self, kernel, q_zmax, Rmax):
+        kernel_input = kernel.make_input([make_q(q_zmax, Rmax)])
+        self.sans_calculator = kernel(kernel_input)
 
     def __call__(self, pars, pd_pars, cutoff=1e-5):