Changes in / [6da1d76:a1ec908] in sasmodels

Location:

sasmodels

Files:

• compare.py (modified) (1 diff)
• direct_model.py (modified) (2 diffs)
• generate.py (modified) (1 diff)
• modelinfo.py (modified) (7 diffs)
• models/hardsphere.py (modified) (1 diff)
• sasview_model.py (modified) (3 diffs)

sasmodels/compare.py

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

sasmodels/direct_model.py

@@ -31 +31 @@
 from . import resolution2d
 from .details import make_kernel_args, dispersion_mesh
+from .modelinfo import DEFAULT_BACKGROUND
 
 # pylint: disable=unused-import
@@ -349 +350 @@
 
         # 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

@@ -968 +968 @@
         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/modelinfo.py

@@ -405 +405 @@
       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
@@ -421 +417 @@
     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()
@@ -478 +471 @@
                          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):
@@ -588 +570 @@
     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:
@@ -691 +673 @@
 
         # 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'):
@@ -790 +772 @@
         return kernel_module.model_info
     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]
@@ -822 +791 @@
     info.docs = kernel_module.__doc__
     info.category = getattr(kernel_module, 'category', None)
-    info.structure_factor = structure_factor
+    info.structure_factor = getattr(kernel_module, 'structure_factor', False)
     info.profile_axes = getattr(kernel_module, 'profile_axes', ['x', 'y'])
     # Note: custom.load_custom_kernel_module assumes the C sources are defined

sasmodels/models/hardsphere.py

@@ -171 +171 @@
 # VR defaults to 1.0
 
+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/sasview_model.py

@@ -382 +382 @@
             hidden.add('scale')
             hidden.add('background')
+            self._model_info.parameters.defaults['background'] = 0.
 
         self._persistency_dict = {}
@@ -880 +881 @@
     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')
@@ -928 +901 @@
     #print("rpa:", test_rpa())
     #test_empty_distribution()
-    #test_structure_factor_background()