Changeset aaf75b6 in sasmodels for example

Timestamp:

Mar 30, 2016 2:39:42 PM (9 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:

885ee37

Parents:

d0876c9d (diff), 364d8f7 (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 polydisp

Conflicts:

sasmodels/direct_model.py

Location:

example

Files:

• fit.py (modified) (6 diffs)
• model.py (modified) (1 diff)
• oriented_usans.py (added)
• polynomial.py (added)

example/fit.py

@@ -31 +31 @@
     model = Model(kernel,
         scale=0.08,
-        rpolar=15, requatorial=800,
-        sld=.291, solvent_sld=7.105,
+        r_polar=15, r_equatorial=800,
+        sld=.291, sld_solvent=7.105,
         background=0,
         theta=90, phi=phi,
         theta_pd=15, theta_pd_n=40, theta_pd_nsigma=3,
-        rpolar_pd=0.222296, rpolar_pd_n=1, rpolar_pd_nsigma=0,
-        requatorial_pd=.000128, requatorial_pd_n=1, requatorial_pd_nsigma=0,
+        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,
         phi_pd=0, phi_pd_n=20, phi_pd_nsigma=3,
         )
@@ -43 +43 @@
 
     # SET THE FITTING PARAMETERS
-    model.rpolar.range(15, 1000)
-    model.requatorial.range(15, 1000)
+    model.r_polar.range(15, 1000)
+    model.r_equatorial.range(15, 1000)
     model.theta_pd.range(0, 360)
     model.background.range(0,1000)
@@ -81 +81 @@
     pars = dict(
         scale=.01, background=35,
-        sld=.291, solvent_sld=5.77, 
+        sld=.291, sld_solvent=5.77,
         radius=250, length=178, 
         theta=90, phi=phi,
@@ -105 +105 @@
     model = Model(kernel,
         scale= .031, radius=19.5, thickness=30, length=22,
-        core_sld=7.105, shell_sld=.291, solvent_sld=7.105,
+        sld_core=7.105, sld_shell=.291, sdl_solvent=7.105,
         background=0, theta=0, phi=phi,
 
@@ -132 +132 @@
     model = Model(kernel,
         scale=.08, radius=20, cap_radius=40, length=400,
-        sld_capcyl=1, sld_solv=6.3,
+        sld=1, sld_solvent=6.3,
         background=0, theta=0, phi=phi,
         radius_pd=.1, radius_pd_n=5, radius_pd_nsigma=3,
@@ -147 +147 @@
     model = Model(kernel,
         scale=0.08, req_minor=15, req_major=20, rpolar=500,
-        sldEll=7.105, solvent_sld=.291,
+        sld=7.105, solvent_sld=.291,
         background=5, theta=0, phi=phi, psi=0,
         theta_pd=20, theta_pd_n=40, theta_pd_nsigma=3,

example/model.py

@@ -17 +17 @@
 model = Model(kernel,
     scale=0.08,
-    rpolar=15, requatorial=800,
-    sld=.291, solvent_sld=7.105,
+    r_polar=15, r_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,
-    rpolar_pd=0.222296, rpolar_pd_n=1, rpolar_pd_nsigma=0,
-    requatorial_pd=.000128, requatorial_pd_n=1, requatorial_pd_nsigma=0,
+    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,
     phi_pd=0, phi_pd_n=20, phi_pd_nsigma=3,
     )
 
 # SET THE FITTING PARAMETERS
-model.rpolar.range(15, 1000)
-model.requatorial.range(15, 1000)
+model.r_polar.range(15, 1000)
+model.r_equatorial.range(15, 1000)
 model.theta_pd.range(0, 360)
 model.background.range(0,1000)