Changes in / [0d26e91:da3638f] in sasmodels

Location:

sasmodels

Files:

• compare.py (modified) (1 diff)
• direct_model.py (modified) (1 diff)
• generate.py (modified) (1 diff)
• jitter.py (modified) (2 diffs)
• kernelcl.py (modified) (3 diffs)
• modelinfo.py (modified) (6 diffs)
• models/hardsphere.py (modified) (1 diff)
• resolution.py (modified) (2 diffs)
• sasview_model.py (modified) (3 diffs)
• weights.py (modified) (1 diff)

sasmodels/compare.py

@@ -1152 +1152 @@
         'rel_err'   : True,
         'explore'   : False,
-        'use_demo'  : False,
+        'use_demo'  : True,
         'zero'      : False,
         'html'      : False,

sasmodels/direct_model.py

@@ -332 +332 @@
 
         # Need to pull background out of resolution for multiple scattering
-        default_background = self._model.info.parameters.common_parameters[1].default
-        background = pars.get('background', default_background)
+        background = pars.get('background', DEFAULT_BACKGROUND)
         pars = pars.copy()
         pars['background'] = 0.

sasmodels/generate.py

@@ -1006 +1006 @@
         pars = model_info.parameters.kernel_parameters
     else:
-        pars = (model_info.parameters.common_parameters
-                + model_info.parameters.kernel_parameters)
+        pars = model_info.parameters.COMMON + model_info.parameters.kernel_parameters
     partable = make_partable(pars)
     subst = dict(id=model_info.id.replace('_', '-'),

sasmodels/jitter.py

@@ -15 +15 @@
     pass
 
-import matplotlib as mpl
 import matplotlib.pyplot as plt
 from matplotlib.widgets import Slider
@@ -747 +746 @@
         pass
 
-    # CRUFT: use axisbg instead of facecolor for matplotlib<2
-    facecolor_prop = 'facecolor' if mpl.__version__ > '2' else 'axisbg'
-    props = {facecolor_prop: 'lightgoldenrodyellow'}
+    axcolor = 'lightgoldenrodyellow'
 
     ## add control widgets to plot
-    axes_theta = plt.axes([0.1, 0.15, 0.45, 0.04], **props)
-    axes_phi = plt.axes([0.1, 0.1, 0.45, 0.04], **props)
-    axes_psi = plt.axes([0.1, 0.05, 0.45, 0.04], **props)
+    axes_theta = plt.axes([0.1, 0.15, 0.45, 0.04], axisbg=axcolor)
+    axes_phi = plt.axes([0.1, 0.1, 0.45, 0.04], axisbg=axcolor)
+    axes_psi = plt.axes([0.1, 0.05, 0.45, 0.04], axisbg=axcolor)
     stheta = Slider(axes_theta, 'Theta', -90, 90, valinit=theta)
     sphi = Slider(axes_phi, 'Phi', -180, 180, valinit=phi)
     spsi = Slider(axes_psi, 'Psi', -180, 180, valinit=psi)
 
-    axes_dtheta = plt.axes([0.75, 0.15, 0.15, 0.04], **props)
-    axes_dphi = plt.axes([0.75, 0.1, 0.15, 0.04], **props)
-    axes_dpsi = plt.axes([0.75, 0.05, 0.15, 0.04], **props)
+    axes_dtheta = plt.axes([0.75, 0.15, 0.15, 0.04], axisbg=axcolor)
+    axes_dphi = plt.axes([0.75, 0.1, 0.15, 0.04], axisbg=axcolor)
+    axes_dpsi = plt.axes([0.75, 0.05, 0.15, 0.04], axisbg=axcolor)
     # Note: using ridiculous definition of rectangle distribution, whose width
     # in sasmodels is sqrt(3) times the given width.  Divide by sqrt(3) to keep

sasmodels/kernelcl.py

@@ -58 +58 @@
 import time
 
-try:
-    from time import perf_counter as clock
-except ImportError: # CRUFT: python < 3.3
-    import sys
-    if sys.platform.count("darwin") > 0:
-        from time import time as clock
-    else:
-        from time import clock
-
 import numpy as np  # type: ignore
+
 
 # Attempt to setup OpenCL. This may fail if the pyopencl package is not
@@ -600 +592 @@
         #call_details.show(values)
         wait_for = None
-        last_nap = clock()
+        last_nap = time.clock()
         step = 1000000//self.q_input.nq + 1
         for start in range(0, call_details.num_eval, step):
@@ -611 +603 @@
                 # Allow other processes to run.
                 wait_for[0].wait()
-                current_time = clock()
+                current_time = time.clock()
                 if current_time - last_nap > 0.5:
                     time.sleep(0.001)

sasmodels/modelinfo.py

@@ -404 +404 @@
       parameters counted as n individual parameters p1, p2, ...
 
-    * *common_parameters* is the list of common parameters, with a unique
-      copy for each model so that structure factors can have a default
-      background of 0.0.
-
     * *call_parameters* is the complete list of parameters to the kernel,
       including scale and background, with vector parameters recorded as
@@ -420 +416 @@
     parameters don't use vector notation, and instead use p1, p2, ...
     """
+    # scale and background are implicit parameters
+    COMMON = [Parameter(*p) for p in COMMON_PARAMETERS]
+
     def __init__(self, parameters):
         # type: (List[Parameter]) -> None
-
-        # scale and background are implicit parameters
-        # Need them to be unique to each model in case they have different
-        # properties, such as default=0.0 for structure factor backgrounds.
-        self.common_parameters = [Parameter(*p) for p in COMMON_PARAMETERS]
-
         self.kernel_parameters = parameters
         self._set_vector_lengths()
@@ -475 +468 @@
                          if p.polydisperse and p.type not in ('orientation', 'magnetic'))
         self.pd_2d = set(p.name for p in self.call_parameters if p.polydisperse)
-
-    def set_zero_background(self):
-        """
-        Set the default background to zero for this model.  This is done for
-        structure factor models.
-        """
-        # type: () -> None
-        # Make sure background is the second common parameter.
-        assert self.common_parameters[1].id == "background"
-        self.common_parameters[1].default = 0.0
-        self.defaults = self._get_defaults()
 
     def check_angles(self):
@@ -585 +567 @@
     def _get_call_parameters(self):
         # type: () -> List[Parameter]
-        full_list = self.common_parameters[:]
+        full_list = self.COMMON[:]
         for p in self.kernel_parameters:
             if p.length == 1:
@@ -688 +670 @@
 
         # Gather the user parameters in order
-        result = control + self.common_parameters
+        result = control + self.COMMON
         for p in self.kernel_parameters:
             if not is2d and p.type in ('orientation', 'magnetic'):
@@ -788 +770 @@
 
     info = ModelInfo()
-
-    # Build the parameter table
     #print("make parameter table", kernel_module.parameters)
     parameters = make_parameter_table(getattr(kernel_module, 'parameters', []))
-
-    # background defaults to zero for structure factor models
-    structure_factor = getattr(kernel_module, 'structure_factor', False)
-    if structure_factor:
-        parameters.set_zero_background()
-
-    # TODO: remove demo parameters
-    # The plots in the docs are generated from the model default values.
-    # Sascomp set parameters from the command line, and so doesn't need
-    # demo values for testing.
     demo = expand_pars(parameters, getattr(kernel_module, 'demo', None))
-
     filename = abspath(kernel_module.__file__).replace('.pyc', '.py')
     kernel_id = splitext(basename(filename))[0]

sasmodels/models/hardsphere.py

@@ -162 +162 @@
     return pars
 
+demo = dict(radius_effective=200, volfraction=0.2,
+            radius_effective_pd=0.1, radius_effective_pd_n=40)
 # Q=0.001 is in the Taylor series, low Q part, so add Q=0.1,
 # assuming double precision sasview is correct

sasmodels/resolution.py

@@ -445 +445 @@
     q = np.sort(q)
     if q_min + 2*MINIMUM_RESOLUTION < q[0]:
-        n_low = int(np.ceil((q[0]-q_min) / (q[1]-q[0]))) if q[1] > q[0] else 15
-        q_low = np.linspace(q_min, q[0], n_low+1)[:-1]
+        n_low = np.ceil((q[0]-q_min) / (q[1]-q[0])) if q[1] > q[0] else 15
+        q_low = np.linspace(q_min, q[0], int(n_low)+1)[:-1]
     else:
         q_low = []
     if q_max - 2*MINIMUM_RESOLUTION > q[-1]:
-        n_high = int(np.ceil((q_max-q[-1]) / (q[-1]-q[-2]))) if q[-1] > q[-2] else 15
-        q_high = np.linspace(q[-1], q_max, n_high+1)[1:]
+        n_high = np.ceil((q_max-q[-1]) / (q[-1]-q[-2])) if q[-1] > q[-2] else 15
+        q_high = np.linspace(q[-1], q_max, int(n_high)+1)[1:]
     else:
         q_high = []
@@ -498 +498 @@
         if q_min < 0:
             q_min = q[0]*MINIMUM_ABSOLUTE_Q
-        n_low = int(np.ceil(log_delta_q * (log(q[0])-log(q_min))))
-        q_low = np.logspace(log10(q_min), log10(q[0]), n_low+1)[:-1]
+        n_low = np.ceil(log_delta_q * (log(q[0])-log(q_min)))
+        q_low = np.logspace(log10(q_min), log10(q[0]), int(n_low)+1)[:-1]
     else:
         q_low = []
     if q_max > q[-1]:
-        n_high = int(np.ceil(log_delta_q * (log(q_max)-log(q[-1]))))
-        q_high = np.logspace(log10(q[-1]), log10(q_max), n_high+1)[1:]
+        n_high = np.ceil(log_delta_q * (log(q_max)-log(q[-1])))
+        q_high = np.logspace(log10(q[-1]), log10(q_max), int(n_high)+1)[1:]
     else:
         q_high = []

sasmodels/sasview_model.py

@@ -382 +382 @@
             hidden.add('scale')
             hidden.add('background')
+            self._model_info.parameters.defaults['background'] = 0.
 
         # Update the parameter lists to exclude any hidden parameters
@@ -930 +931 @@
     CylinderModel().evalDistribution([0.1, 0.1])
 
-def test_structure_factor_background():
-    # type: () -> None
-    """
-    Check that sasview model and direct model match, with background=0.
-    """
-    from .data import empty_data1D
-    from .core import load_model_info, build_model
-    from .direct_model import DirectModel
-
-    model_name = "hardsphere"
-    q = [0.0]
-
-    sasview_model = _make_standard_model(model_name)()
-    sasview_value = sasview_model.evalDistribution(np.array(q))[0]
-
-    data = empty_data1D(q)
-    model_info = load_model_info(model_name)
-    model = build_model(model_info)
-    direct_model = DirectModel(data, model)
-    direct_value_zero_background = direct_model(background=0.0)
-
-    assert sasview_value == direct_value_zero_background
-
-    # Additionally check that direct value background defaults to zero
-    direct_value_default = direct_model()
-    assert sasview_value == direct_value_default
-
-
 def magnetic_demo():
     Model = _make_standard_model('sphere')
@@ -978 +951 @@
     #print("rpa:", test_rpa())
     #test_empty_distribution()
-    #test_structure_factor_background()

sasmodels/weights.py

@@ -23 +23 @@
     default = dict(npts=35, width=0, nsigmas=3)
     def __init__(self, npts=None, width=None, nsigmas=None):
-        self.npts = self.default['npts'] if npts is None else int(npts)
+        self.npts = self.default['npts'] if npts is None else npts
         self.width = self.default['width'] if width is None else width
         self.nsigmas = self.default['nsigmas'] if nsigmas is None else nsigmas