Changeset be86916 in sasmodels

Timestamp:

Nov 6, 2016 5:29:57 AM (8 years ago)

Author:

ajj

Branches:

release_v0.95

Parents:

f837f0b

git-author:

Paul Kienzle <pkienzle@…> (10/10/16 12:36:59)

git-committer:

Andrew Jackson <andrew.jackson@…> (11/06/16 05:29:57)

Message:

hide structure factor background/scale from sasview gui. Fixes #657.

File:

• sasmodels/sasview_model.py (modified) (3 diffs)

sasmodels/sasview_model.py

@@ -311 +311 @@
         else:
             hidden = set()
+        if self._model_info.structure_factor:
+            hidden.add('scale')
+            hidden.add('background')
+            self._model_info.parameters.defaults['background'] = 0.
 
         self._persistency_dict = {}
@@ -655 +659 @@
                 return [self.multiplicity], [1.0]
             else:
-                return [np.NaN], [1.0]
+                # For hidden parameters use the default value.
+                value = self._model_info.parameters.defaults.get(par.name, np.NaN)
+                return [value], [1.0]
         elif par.polydisperse:
             dis = self.dispersion[par.name]
@@ -676 +682 @@
     cylinder = Cylinder()
     return cylinder.evalDistribution([0.1, 0.1])
+
+def test_structure_factor():
+    # type: () -> float
+    """
+    Test that a sasview model (cylinder) can be run.
+    """
+    Model = _make_standard_model('hardsphere')
+    model = Model()
+    value = model.evalDistribution([0.1, 0.1])
+    if np.isnan(value):
+        raise ValueError("hardsphere returns null")
 
 def test_rpa():