Changeset e5ce788 in sasmodels

Timestamp:

Mar 21, 2016 8:38:17 AM (8 years ago)

Author:

butler

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:

e56883e

Parents:

c6ca41e (diff), 9217ef8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels.git

Files:

• example/sesans_parameters_sphere.py (modified) (1 diff)
• example/sesansfit.py (modified) (2 diffs)
• sasmodels/bumps_model.py (modified) (1 diff)
• sasmodels/convert.py (modified) (2 diffs)
• sasmodels/models/multi_shell.c (deleted)
• sasmodels/models/multi_shell.py (deleted)
• sasmodels/models/multilayer_vesicle.c (added)
• sasmodels/models/multilayer_vesicle.py (added)

example/sesans_parameters_sphere.py

@@ -27 +27 @@
     "sld" : 7.0,
     "radius" : 1000,
-    "solvent_sld" : 1.0,
+    "sld_solvent" : 1.0,
 }
 

example/sesansfit.py

@@ -54 +54 @@
 
     # Load custom parameters, initial values and parameter ranges
+    pars = model.parameters().copy()
+    pars.update(custom_params)
     for k, v in custom_params.items():
+        if k not in pars:
+            par_error("Can't set parameter %r in model"%k, pars)
         setattr(model, k, v)
         model._parameter_names.append(k)
     for k, v in initial_vals.items():
-        param = model.parameters().get(k)
+        if k not in pars:
+            par_error("Can't get parameter %r from model"%k, pars)
+        param = pars[k]
         param.value = v
     for k, v in param_range.items():
-        param = model.parameters().get(k)
-        if param is not None:
-            param.range(*v)
+        if k not in pars:
+            par_error("Can't set range on parameter %r in model"%k, pars)
+        param = pars[k]
+        param.range(*v)
 
     if False: # for future implementation
@@ -73 +80 @@
         problem = FitProblem(M_sesans)
     return problem
+
+
+def par_error(msg, pars):
+    raise ValueError(msg+"\nAvailable parameters: %s"%", ".join(sorted(pars.keys())))

sasmodels/bumps_model.py

@@ -238 +238 @@
         Not Implemented.
         """
+        if self.data_type == "sesans":
+            np.savetxt(basename+".dat", np.array([self._data.x, self.theory()]).T)
         pass
 

sasmodels/convert.py

@@ -156 +156 @@
         elif name == 'vesicle':
             del oldpars['volfraction']
+        elif name == 'multilayer_vesicle':
+            del oldpars['volfraction']
 
     return oldpars
@@ -195 +197 @@
         elif name == 'vesicle':
             pars['volfraction'] = 1
+        elif name == 'multilayer_vesicle':
+            pars['volfraction'] = 1