Changeset fc7aa39 in sasmodels

Timestamp:

Mar 20, 2016 2:52:40 AM (8 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

Files:

• example/sesans_parameters_sphere.py (modified) (1 diff)
• example/sesansfit.py (modified) (2 diffs)
• CylinderModel.py (deleted)
• doc/Makefile (modified) (1 diff)
• sasmodels/models/bessel.py (modified) (1 diff)
• sasmodels/models/cylinder.py (modified) (1 diff)
• sasmodels/models/ellipsoid.py (modified) (1 diff)
• sasmodels/models/img/ellipsoid_comparison_2d.jpg (added)
• sasmodels/models/img/squarewell.png (added)
• sasmodels/models/parallelepiped.py (modified) (1 diff)
• sasmodels/models/porod.py (modified) (1 diff)
• sasmodels/models/squarewell.py (modified) (2 diffs)
• sasmodels/models/triaxial_ellipsoid.py (modified) (1 diff)
• sasmodels/resolution.py (modified) (1 diff)

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

doc/Makefile

@@ -85 +85 @@
 
 clean:
-        -$(RMDIR) _build model api ref/models
+        -$(RMDIR) _build model api ref$(PATHSEP)models
 
 html: build

sasmodels/models/bessel.py

@@ -33 +33 @@
 Validation of our code was done by comparing the output of the 1D model
 to the output of the software provided by the NIST (Kline, 2006).
-Figure :num:`figure #sphere-comparison` shows a comparison of the output
+Figure :numref:`figure #sphere-comparison` shows a comparison of the output
 of our model and the output of the NIST software.
 

sasmodels/models/cylinder.py

@@ -31 +31 @@
 To provide easy access to the orientation of the cylinder, we define the
 axis of the cylinder using two angles $\theta$ and $\phi$. Those angles
-are defined in :num:`figure #cylinder-angle-definition`.
+are defined in :numref:`figure #cylinder-angle-definition`.
 
 .. _cylinder-angle-definition:

sasmodels/models/ellipsoid.py

@@ -39 +39 @@
 the rotation axis of the ellipsoid using two angles $\theta$ and $\phi$.
 These angles are defined in the
-:ref:`cylinder orientation figure <cylinder-orientation>`.
+:ref:`cylinder orientation figure <cylinder-angle-definition>`.
 For the ellipsoid, $\theta$ is the angle between the rotational axis
 and the $z$-axis.

sasmodels/models/parallelepiped.py

@@ -7 +7 @@
 ----------
 
-| This model calculates the scattering from a rectangular parallelepiped (:num:`Figure #parallelepiped-image`).
+| This model calculates the scattering from a rectangular parallelepiped (:numref:`Figure #parallelepiped-image`).
 | If you need to apply polydispersity, see also :ref:`rectangular-prism`.
 

sasmodels/models/porod.py

@@ -19 +19 @@
     q = \sqrt{q_x^2+q_y^2}
 
+References
+----------
+
+G Porod. *Kolloid Zeit*. 124 (1951) 83.
+L A Feigin, D I Svergun, G W Taylor. *Structure Analysis by Small-Angle X-ray and Neutron Scattering*. Springer. (1987)
 """
 

sasmodels/models/squarewell.py

@@ -14 +14 @@
 The interaction potential is:
 
-.. comment::
-
-  .. image:: img/image225.PNG
+  .. image:: img\squarewell.png
 
 .. math::
@@ -37 +35 @@
     q = \sqrt{q_x^2 + q_y^2}
 
+References
+----------
 
-REFERENCE
-
-R V Sharma, K C Sharma, *Physica*, 89A (1977) 213
+R V Sharma, K C Sharma, *Physica*, 89A (1977) 213.
 
 """

sasmodels/models/triaxial_ellipsoid.py

@@ -36 +36 @@
 we define the axis of the cylinder using the angles $\theta$, $\phi$
 and $\psi$. These angles are defined on
-:num:`figure #triaxial-ellipsoid-angles`.
+:numref:`figure #triaxial-ellipsoid-angles`.
 The angle $\psi$ is the rotational angle around its own $c$ axis
 against the $q$ plane. For example, $\psi = 0$ when the

sasmodels/resolution.py

@@ -196 +196 @@
                 \,dq_\perp dq_\parallel
 
-
-    Definition
-    ----------
+    **Definition**
 
     We are using the mid-point integration rule to assign weights to each