Changeset 2f9f1ec in sasmodels for example

Timestamp:

Apr 20, 2017 3:57:02 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

costrafo411

Children:

65ceb7d, 7cb1c36

Parents:

2cdc35b (diff), 630156b (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 costrafo411

Location:

example

Files:

• latex_smeared_out_0.txt (added)
• latex_smeared_out_1.txt (added)
• oriented_usans.py (modified) (2 diffs)
• simul_fit.py (added)
• 6pc SD.txt (added)
• Beise009798_01.ses (added)
• Beise009798_02.ses (added)
• Beise009798_03.ses (added)
• Gab_5pc_deb2p0.ses (added)
• Gab_5pc_deb2p0.txt (added)
• oriented_sesans.py (added)
• unoriented_sesans.py (added)

example/oriented_usans.py

@@ -19 +19 @@
     scale=0.08, background=0,
     sld=.291, sld_solvent=7.105,
-    r_polar=1800, r_polar_pd=0.222296, r_polar_pd_n=0,
-    r_equatorial=2600, r_equatorial_pd=0.28, r_equatorial_pd_n=0,
+    radius_polar=1800, radius_polar_pd=0.222296, radius_polar_pd_n=0,
+    radius_equatorial=2600, radius_equatorial_pd=0.28, radius_equatorial_pd_n=0,
     theta=60, theta_pd=0, theta_pd_n=0,
     phi=60, phi_pd=0, phi_pd_n=0,
@@ -26 +26 @@
 
 # SET THE FITTING PARAMETERS
-model.r_polar.range(1000, 10000)
-model.r_equatorial.range(1000, 10000)
+model.radius_polar.range(1000, 10000)
+model.radius_equatorial.range(1000, 10000)
 model.theta.range(0, 360)
 model.phi.range(0, 360)