Changeset 17db833 in sasmodels

Timestamp:

Nov 2, 2017 5:59:45 PM (7 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:

c11d09f, 82592da, c15e03c

Parents:

ce99754

Message:

fix structure factor models, so scale=1, background=0 again

File:

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

sasmodels/sasview_model.py

@@ -764 +764 @@
                 return self.multiplicity, [self.multiplicity], [1.0]
             else:
-                # For hidden parameters use NaN
-                return np.NaN, [np.NaN], [1.0]
+                # For hidden parameters use default values.  This sets
+                # scale=1 and background=0 for structure factors
+                default = self._model_info.parameters.defaults.get(par.name, np.NaN)
+                return default, [default], [1.0]
         elif par.polydisperse:
             value = self.params[par.name]
@@ -796 +798 @@
     Model = _make_standard_model('hardsphere')
     model = Model()
-    value = model.evalDistribution([0.1, 0.1])
-    if np.isnan(value):
-        raise ValueError("hardsphere returns null")
+    value2d = model.evalDistribution([0.1, 0.1])
+    value1d = model.evalDistribution(np.array([0.1*np.sqrt(2)]))
+    #print("hardsphere", value1d, value2d)
+    if np.isnan(value1d) or np.isnan(value2d):
+        raise ValueError("hardsphere returns nan")
 
 def test_product():
@@ -865 +869 @@
     print("cylinder(0.1,0.1)=%g"%test_cylinder())
     #test_product()
-    #test_rpa()
+    #test_structure_factor()
+    #print("rpa:", test_rpa())
     #test_empty_distribution()