Changeset b297ba9 in sasmodels for sasmodels/multiscat.py

Timestamp:

Mar 20, 2019 7:03:50 PM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

4e28511

Parents:

0d362b7

Message:

lint

File:

• sasmodels/multiscat.py (modified) (7 diffs)

sasmodels/multiscat.py

@@ -103 +103 @@
 USE_FAST = True  # OpenCL faster, less accurate math
 
-class ICalculator:
+class ICalculator(object):
     """
     Multiple scattering calculator
@@ -113 +113 @@
         raise NotImplementedError()
 
-    def ifft(self, Iq):
+    def ifft(self, fourier_frame):
         """
         Compute the inverse FFT for an image, complex -> complex.
@@ -119 +119 @@
         raise NotImplementedError()
 
-    def mulitple_scattering(self, Iq):
+    def multiple_scattering(self, Iq, p, coverage=0.99):
         r"""
         Compute multiple scattering for I(q) given scattering probability p.
@@ -250 +250 @@
         gpu_poly = cl_array.to_device(self.queue, poly)
         self.plan.execute(gpu_data.data)
-        degree, data_size= poly.shape[0], frame.shape[0]*frame.shape[1]
+        degree, data_size = poly.shape[0], frame.shape[0]*frame.shape[1]
         self.polyval1(
             self.queue, [data_size], None,
@@ -575 +575 @@
 
 def main():
+    """Command line interface to multiple scattering calculator."""
     parser = argparse.ArgumentParser(
         description="Compute multiple scattering",
@@ -612 +613 @@
     theory = call_kernel(kernel, pars)
     Iq = res.apply(theory) + bg
-    plot_and_save_powers(res, theory, Iq, outfile=opts.outfile, background=bg)
-
-def plot_and_save_powers(res, theory, result, plot=True, outfile="", background=0.):
+    _plot_and_save_powers(res, theory, Iq, outfile=opts.outfile, background=bg)
+
+def _plot_and_save_powers(res, theory, result, plot=True,
+                          outfile="", background=0.):
     import pylab
     probability, coverage = res.probability, res.coverage
@@ -678 +680 @@
 
 def plotxy(q, Iq):
+    """Plot q, Iq or (qx, qy), Iqxy."""
     import pylab
     # q is a tuple of (q,) or (qx, qy)