Changeset 7ae2b7f in sasmodels for sasmodels/resolution.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/resolution.py (modified) (9 diffs)

sasmodels/resolution.py

@@ -6 +6 @@
 from __future__ import division
 
-from scipy.special import erf
-from numpy import sqrt, log, log10
-import numpy as np
+from scipy.special import erf  # type: ignore
+from numpy import sqrt, log, log10, exp, pi  # type: ignore
+import numpy as np  # type: ignore
 
 __all__ = ["Resolution", "Perfect1D", "Pinhole1D", "Slit1D",
@@ -35 +35 @@
     smeared theory I(q).
     """
-    q = None
-    q_calc = None
+    q = None  # type: np.ndarray
+    q_calc = None  # type: np.ndarray
     def apply(self, theory):
         """
@@ -489 +489 @@
     *q0* is the center, *dq* is the width and *q* are the points to evaluate.
     """
-    from numpy import exp, pi
     return exp(-0.5*((q-q0)/dq)**2)/(sqrt(2*pi)*dq)
 
@@ -500 +499 @@
     that make it slow to evaluate but give it good accuracy.
     """
-    from scipy.integrate import romberg
+    from scipy.integrate import romberg  # type: ignore
 
     par_set = set([p.name for p in form.info.parameters.call_parameters])
@@ -555 +554 @@
     that make it slow to evaluate but give it good accuracy.
     """
-    from scipy.integrate import romberg
+    from scipy.integrate import romberg  # type: ignore
 
     par_set = set([p.name for p in form.info.parameters.call_parameters])
@@ -752 +751 @@
         #tol = 0.001
         ## The default 3 sigma and no extra points gets 1%
-        q_calc, tol = None, 0.01
+        q_calc = None  # type: np.ndarray
+        tol = 0.01
         resolution = Pinhole1D(q, q_width, q_calc=q_calc)
         output = self._eval_sphere(pars, resolution)
         if 0: # debug plot
-            import matplotlib.pyplot as plt
+            import matplotlib.pyplot as plt  # type: ignore
             resolution = Perfect1D(q)
             source = self._eval_sphere(pars, resolution)
@@ -1028 +1028 @@
     """
     import sys
-    import xmlrunner
+    import xmlrunner  # type: ignore
 
     suite = unittest.TestSuite()
@@ -1076 +1076 @@
         Iq_romb = romberg_pinhole_1d(resolution.q, dq, model, pars)
 
-    import matplotlib.pyplot as plt
+    import matplotlib.pyplot as plt  # type: ignore
     plt.loglog(resolution.q_calc, theory, label='unsmeared')
     plt.loglog(resolution.q, Iq, label='smeared', hold=True)
@@ -1111 +1111 @@
     Run the resolution demos.
     """
-    import matplotlib.pyplot as plt
+    import matplotlib.pyplot as plt  # type: ignore
     plt.subplot(121)
     demo_pinhole_1d()