Changeset bd49c79 in sasmodels

Timestamp:

Aug 4, 2016 4:47:27 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

54bcd4a

Parents:

e1d6983

Message:

improve handling of multiplicity in sasview comparison

Location:

sasmodels

Files:

• compare.py (modified) (3 diffs)
• convert.py (modified) (2 diffs)

sasmodels/compare.py

@@ -348 +348 @@
             nsigma=pars.get(p.id+"_pd_nsgima", 3.),
             pdtype=pars.get(p.id+"_pd_type", 'gaussian'),
+            relative_pd=p.relative_pd,
         )
         lines.append(_format_par(p.name, **fields))
@@ -354 +355 @@
     #return "\n".join("%s: %s"%(p, v) for p, v in sorted(pars.items()))
 
-def _format_par(name, value=0., pd=0., n=0, nsigma=3., pdtype='gaussian'):
+def _format_par(name, value=0., pd=0., n=0, nsigma=3., pdtype='gaussian',
+                relative_pd=False):
     # type: (str, float, float, int, float, str) -> str
     line = "%s: %g"%(name, value)
     if pd != 0.  and n != 0:
+        if relative_pd:
+            pd *= value
         line += " +/- %g  (%d points in [-%g,%g] sigma %s)"\
                 % (pd, n, nsigma, nsigma, pdtype)
@@ -446 +450 @@
         Sasview calculator for model.
         """
-        # For multiplicity models, recreate the model the first time the
-        if model_info.control:
-            model[0] = ModelClass(int(pars[model_info.control]))
+        oldpars = revert_pars(model_info, pars)
+        # For multiplicity models, create a model with the correct multiplicity
+        control = oldpars.pop("CONTROL", None)
+        if control is not None:
+            # sphericalSLD has one fewer multiplicity.  This update should
+            # happen in revert_pars, but it hasn't been called yet.
+            model[0] = ModelClass(control)
         # paying for parameter conversion each time to keep life simple, if not fast
-        oldpars = revert_pars(model_info, pars)
         #print("sasview pars",oldpars)
         for k, v in oldpars.items():

sasmodels/convert.py

@@ -159 +159 @@
     # Remove control parameter from the result
     if model_info.control:
-        translation[model_info.control] = None
+        translation[model_info.control] = "CONTROL"
     return translation
 
@@ -191 +191 @@
         oldpars = _trim_vectors(model_info, pars, oldpars)
 
+    # Make sure the control parameter is an integer
+    if "CONTROL" in oldpars:
+        oldpars["CONTROL"] = int(oldpars["CONTROL"])
 
     # Note: update compare.constrain_pars to match