Changeset c26897a in sasmodels for example

Timestamp:

Jun 26, 2017 8:13:26 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

870a2f4

Parents:

b52e00f (diff), c935936 (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' into doc_update

Location:

example

Files:

• 093191_201.dat (added)
• 093192_202.dat (added)
• 093193_203.dat (added)
• 093194_204.dat (added)
• 093195_205.dat (added)
• batch_fit.py (added)
• model_ellipsoid_hayter_msa.py (added)
• cylinder_eval.py (added)
• model.py (modified) (1 diff)

example/model.py

@@ -17 +17 @@
 model = Model(kernel,
     scale=0.08,
-    r_polar=15, r_equatorial=800,
+    radius_polar=15, radius_equatorial=800,
     sld=.291, sld_solvent=7.105,
     background=0,
     theta=90, phi=0,
     theta_pd=15, theta_pd_n=40, theta_pd_nsigma=3,
-    r_polar_pd=0.222296, r_polar_pd_n=1, r_polar_pd_nsigma=0,
-    r_equatorial_pd=.000128, r_equatorial_pd_n=1, r_equatorial_pd_nsigma=0,
+    radius_polar_pd=0.222296, radius_polar_pd_n=1, radius_polar_pd_nsigma=0,
+    radius_equatorial_pd=.000128, radius_equatorial_pd_n=1, radius_equatorial_pd_nsigma=0,
     phi_pd=0, phi_pd_n=20, phi_pd_nsigma=3,
     )
 
 # SET THE FITTING PARAMETERS
-model.r_polar.range(15, 1000)
-model.r_equatorial.range(15, 1000)
+model.radius_polar.range(15, 1000)
+model.radius_equatorial.range(15, 1000)
 model.theta_pd.range(0, 360)
 model.background.range(0,1000)