Changeset ce99754 in sasmodels

Timestamp:

Nov 2, 2017 3:44:10 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:

17db833

Parents:

6aee3ab

Message:

make sure that nominal values get into the weight vector even when there is no pd so that pd loops are simpler

Location:

sasmodels

Files:

• details.py (modified) (1 diff)
• product.py (modified) (1 diff)
• sasview_model.py (modified) (6 diffs)

sasmodels/details.py

@@ -318 +318 @@
     parameter set in the vector.
     """
-    value, dispersity, weight = zip(*mesh)
+    _, dispersity, weight = zip(*mesh)
     #weight = [w if len(w)>0 else [1.] for w in weight]
     weight = np.vstack([v.flatten() for v in meshgrid(*weight)])

sasmodels/product.py

@@ -279 +279 @@
     weight = values[nvalues + call_details.num_weights: nvalues + 2*call_details.num_weights]
     npars = model_info.parameters.npars
-    pairs = [(value[offset:offset+length], weight[offset:offset+length])
+    # Note: changed from pairs ([v], [w]) to triples (p, [v], [w]), but the
+    # dispersion mesh code doesn't actually care about the nominal parameter
+    # value, p, so set it to None.
+    pairs = [(None, value[offset:offset+length], weight[offset:offset+length])
              for p, offset, length
              in zip(model_info.parameters.call_parameters[2:2+npars],

sasmodels/sasview_model.py

@@ -673 +673 @@
         #call_details.show()
         #print("pairs", pairs)
+        #for k, p in enumerate(self._model_info.parameters.call_parameters):
+        #    print(k, p.name, *pairs[k])
         #print("params", self.params)
         #print("values", values)
@@ -678 +680 @@
         result = calculator(call_details, values, cutoff=self.cutoff,
                             magnetic=is_magnetic)
+        #print("result", result)
         self._intermediate_results = getattr(calculator, 'results', None)
         calculator.release()
@@ -761 +764 @@
                 return self.multiplicity, [self.multiplicity], [1.0]
             else:
-                # For hidden parameters use the default value.
-                default = self._model_info.parameters.defaults.get(par.name, np.NaN)
-                return default, [default], [1.0]
+                # For hidden parameters use NaN
+                return np.NaN, [np.NaN], [1.0]
         elif par.polydisperse:
             value = self.params[par.name]
@@ -776 +778 @@
         else:
             value = self.params[par.name]
-            return value, [value if par.relative_pd else 0.0], [1.0]
+            return value, [value], [1.0]
 
 def test_cylinder():
@@ -797 +799 @@
     if np.isnan(value):
         raise ValueError("hardsphere returns null")
+
+def test_product():
+    # type: () -> float
+    """
+    Test that 2-D hardsphere model runs and doesn't produce NaN.
+    """
+    S = _make_standard_model('hayter_msa')()
+    P = _make_standard_model('cylinder')()
+    model = MultiplicationModel(P, S)
+    value = model.evalDistribution([0.1, 0.1])
+    if np.isnan(value):
+        raise ValueError("cylinder*hatyer_msa returns null")
 
 def test_rpa():
@@ -850 +864 @@
 if __name__ == "__main__":
     print("cylinder(0.1,0.1)=%g"%test_cylinder())
+    #test_product()
+    #test_rpa()
     #test_empty_distribution()