Changeset 190fc2b in sasmodels

Timestamp:

Jan 28, 2016 10:35:57 PM (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:

d4666ca

Message:

delint

Location:

sasmodels

Files:

• bumps_model.py (modified) (1 diff)
• compare.py (modified) (2 diffs)
• core.py (modified) (2 diffs)
• generate.py (modified) (11 diffs)
• resolution.py (modified) (2 diffs)
• sesans.py (modified) (1 diff)

sasmodels/bumps_model.py

@@ -12 +12 @@
 """
 
+import warnings
+
+import numpy as np
+
+from .data import plot_theory
+from .direct_model import DataMixin
+
 __all__ = [
     "Model", "Experiment",
     ]
-
-import warnings
-
-import numpy as np
-
-from .data import plot_theory
-from .direct_model import DataMixin
 
 # CRUFT: old style bumps wrapper which doesn't separate data and model

sasmodels/compare.py

@@ -28 +28 @@
 
 from __future__ import print_function
+
+import sys
+import math
+from os.path import basename, dirname, join as joinpath
+import glob
+import datetime
+import traceback
+
+import numpy as np
+
+from . import core
+from . import kerneldll
+from . import generate
+from .data import plot_theory, empty_data1D, empty_data2D
+from .direct_model import DirectModel
+from .convert import revert_model, constrain_new_to_old
 
 USAGE = """
@@ -80 +96 @@
            + USAGE)
 
-
-
-import sys
-import math
-from os.path import basename, dirname, join as joinpath
-import glob
-import datetime
-import traceback
-
-import numpy as np
-
+kerneldll.ALLOW_SINGLE_PRECISION_DLLS = True
+
+# List of available models
 ROOT = dirname(__file__)
-sys.path.insert(0, ROOT)  # Make sure sasmodels is first on the path
-
-
-from . import core
-from . import kerneldll
-from . import generate
-from .data import plot_theory, empty_data1D, empty_data2D
-from .direct_model import DirectModel
-from .convert import revert_model, constrain_new_to_old
-kerneldll.ALLOW_SINGLE_PRECISION_DLLS = True
-
-# List of available models
 MODELS = [basename(f)[:-3]
           for f in sorted(glob.glob(joinpath(ROOT, "models", "[a-zA-Z]*.py")))]

sasmodels/core.py

@@ -2 +2 @@
 Core model handling routines.
 """
-__all__ = [
-    "list_models", "load_model_definition", "precompile_dll",
-    "load_model", "make_kernel", "call_kernel", "call_ER", "call_VR",
-    ]
 
 from os.path import basename, dirname, join as joinpath
@@ -24 +20 @@
     HAVE_OPENCL = False
 
+__all__ = [
+    "list_models", "load_model_definition", "precompile_dll",
+    "load_model", "make_kernel", "call_kernel", "call_ER", "call_VR",
+]
 
 def list_models():

sasmodels/generate.py

@@ -197 +197 @@
 # TODO: identify model files which have changed since loading and reload them.
 
-__all__ = ["make", "doc", "sources", "convert_type"]
-
 import sys
 from os.path import abspath, dirname, join as joinpath, exists, basename, \
@@ -206 +204 @@
 
 import numpy as np
+
+__all__ = ["make", "doc", "sources", "convert_type"]
+
 C_KERNEL_TEMPLATE_PATH = joinpath(dirname(__file__), 'kernel_template.c')
 
@@ -216 +217 @@
     F128 = None
 
-
 # Scale and background, which are parameters common to every form factor
 COMMON_PARAMETERS = [
@@ -222 +222 @@
     ["background", "1/cm", 0, [0, np.inf], "", "Source background"],
     ]
-
 
 # Conversion from units defined in the parameter table for each model
@@ -266 +265 @@
 
 def format_units(units):
+    """
+    Convert units into ReStructured Text format.
+    """
     return "string" if isinstance(units, list) else RST_UNITS.get(units, units)
 
@@ -335 +337 @@
     """
     Convert code from double precision to the desired type.
+
+    Floating point constants are tagged with 'f' for single precision or 'L'
+    for long double precision.
     """
     if dtype == F16:
@@ -350 +355 @@
 
 def _convert_type(source, type_name, constant_flag):
+    """
+    Replace 'double' with *type_name* in *source*, tagging floating point
+    constants with *constant_flag*.
+    """
     # Convert double keyword to float/long double/half.
     # Accept an 'n' # parameter for vector # values, where n is 2, 4, 8 or 16.
@@ -625 +634 @@
                             %re.escape(string.punctuation))
 def _convert_section_titles_to_boldface(lines):
+    """
+    Do the actual work of identifying and converting section headings.
+    """
     prior = None
     for line in lines:
@@ -642 +654 @@
         yield prior
 
-def convert_section_titles_to_boldface(string):
-    return "\n".join(_convert_section_titles_to_boldface(string.split('\n')))
+def convert_section_titles_to_boldface(s):
+    """
+    Use explicit bold-face rather than section headings so that the table of
+    contents is not polluted with section names from the model documentation.
+
+    Sections are identified as the title line followed by a line of punctuation
+    at least as long as the title line.
+    """
+    return "\n".join(_convert_section_titles_to_boldface(s.split('\n')))
 
 def doc(kernel_module):
@@ -666 +685 @@
 
 def demo_time():
+    """
+    Show how long it takes to process a model.
+    """
     from .models import cylinder
     import datetime
@@ -674 +696 @@
 
 def main():
+    """
+    Program which prints the source produced by the model.
+    """
     if len(sys.argv) <= 1:
         print("usage: python -m sasmodels.generate modelname")

sasmodels/resolution.py

@@ -5 +5 @@
 """
 from __future__ import division
+
+from scipy.special import erf
+from numpy import sqrt, log, log10
+import numpy as np
 
 __all__ = ["Resolution", "Perfect1D", "Pinhole1D", "Slit1D",
@@ -11 +15 @@
            "interpolate", "linear_extrapolation", "geometric_extrapolation",
            ]
-
-from scipy.special import erf
-from numpy import sqrt, log, log10
-import numpy as np
 
 MINIMUM_RESOLUTION = 1e-8

sasmodels/sesans.py

@@ -43 +43 @@
     *I* [cm$^{-1}$] is the value of the SANS model at *q*
     """
-    G = np.zeros(len(SElength), 'd')
-    for i in range(len(SElength)):
-        integr = besselj(0, q*SElength[i])*Iq*q
-        G[i] = np.sum(integr)
+    G = np.zeros_like(SElength, 'd')
+    for i, SElength_i in enumerate(SElength):
+        integral = besselj(0, q*SElength_i)*Iq*q
+        G[i] = np.sum(integral)
 
     # [m^-1] step size in q, needed for integration
-    dq=(q[1]-q[0])*1e10
+    dq = (q[1]-q[0])*1e10
 
     # integration step, convert q into [m**-1] and 2 pi circle integration