Changeset 0535624 in sasmodels

Timestamp:

Sep 27, 2018 11:53:30 PM (6 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:

6da1d76

Parents:

293fee5

Message:

set background=0 in modelinfo.defaults, and simplify sasview model wrapper

Location:

sasmodels

Files:

• modelinfo.py (modified) (2 diffs)
• sasview_model.py (modified) (1 diff)

sasmodels/modelinfo.py

@@ -478 +478 @@
                          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):
@@ -787 +798 @@
     structure_factor = getattr(kernel_module, 'structure_factor', False)
     if structure_factor:
-        # Make sure background is the second common parameter.
-        assert parameters.common_parameters[1].id == "background"
-        parameters.common_parameters[1].default = 0.0
+        parameters.set_zero_background()
 
     # TODO: remove demo parameters

sasmodels/sasview_model.py

@@ -371 +371 @@
             hidden.add('scale')
             hidden.add('background')
-            self._model_info.parameters.defaults['background'] = 0.
 
         self._persistency_dict = {}