Changes in example/sesans_parameters_sphere.py [84db7a5:a98958b] in sasmodels

File:

• example/sesans_parameters_sphere.py (modified) (2 diffs)

example/sesans_parameters_sphere.py

@@ -9 +9 @@
 model_name = "sphere"
 
-# DO NOT MODIFY THIS LINE
-model = sesansfit.get_bumps_model(model_name)
-
 # Enter any custom parameters
-# name = Parameter(initial_value, name='name')
 phi = Parameter(0.10, name='phi')
-# Add the parameters to this list that should be displayed in the fitting window
 custom_params = {"phi" : phi}
 
-# SESANS data file name
+# SESANS data file
 sesans_file = "sphere.ses"
 
 # Initial parameter values (if other than defaults)
-# "model_parameter_name" : value
 initial_vals = {
+    "scale" : phi*(1 - phi),
     "sld" : 7.0,
+    "solvent_sld" : 1.0,
     "radius" : 1000,
-    "solvent_sld" : 1.0,
 }
 
 # Ranges for parameters if other than default
-# "model_parameter_name" : [min, max]
 param_range = {
     "phi" : [0.001, 0.5],
@@ -36 +30 @@
 }
 
-# Constraints
-# model.param_name = f(other params)
-# EXAMPLE: model.scale = model.radius*model.radius*(1 - phi) - where radius and scale are model functions and phi is
-# a custom parameter
-model.scale = phi*(1-phi)
-
 # Send to the fitting engine
-# DO NOT MODIFY THIS LINE
-problem = sesansfit.sesans_fit(sesans_file, model, initial_vals, custom_params, param_range)
-
+problem = sesansfit.sesans_fit(sesans_file, model_name, initial_vals, custom_params, param_range)