Changeset fc7aa39 in sasmodels for example

Timestamp:

Mar 20, 2016 4:52:40 AM (9 years ago)

Author:

smk78

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:

275b98e5, 74fd96f

Parents:

2f63032 (diff), fa902d4 (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

Location:

example

Files:

• sesans_parameters_sphere.py (modified) (1 diff)
• sesansfit.py (modified) (2 diffs)

example/sesans_parameters_sphere.py

@@ -11 +11 @@
 # DO NOT MODIFY THIS LINE
 model = sesansfit.get_bumps_model(model_name)
+model.radius.range(1,10000)
 
 # Enter any custom parameters

example/sesansfit.py

@@ -47 +47 @@
 
     data.has_no_finite_acceptance = acceptance_angle is not None
-    if "radius" in initial_vals:
-        radius = initial_vals.get("radius")
-    else:
-        radius = 1000
+    radius = initial_vals.get("radius", 1000)
     data.Rmax = 30*radius # [A]
 
@@ -62 +59 @@
     for k, v in initial_vals.items():
         param = model.parameters().get(k)
-        setattr(param, "value", v)
+        param.value = v
     for k, v in param_range.items():
         param = model.parameters().get(k)
         if param is not None:
-            setattr(param.bounds, "limits", v)
+            param.range(*v)
 
     if False: # for future implementation