Changes in / [275b07dc:57c609b] in sasmodels

Files:

• doc/guide/magnetism/magnetism.rst (modified) (1 diff)
• sasmodels/models/spinodal.py (modified) (3 diffs)
• setup.py (modified) (2 diffs)

doc/guide/magnetism/magnetism.rst

@@ -89 +89 @@
 
 ===========   ================================================================
- sld_M0       $D_M M_0$
- sld_mtheta   $\theta_M$
- sld_mphi     $\phi_M$
- up_frac_i    $u_i$ = (spin up)/(spin up + spin down) *before* the sample
- up_frac_f    $u_f$ = (spin up)/(spin up + spin down) *after* the sample
- up_angle     $\theta_\mathrm{up}$
+ M0:sld       $D_M M_0$
+ mtheta:sld   $\theta_M$
+ mphi:sld     $\phi_M$
+ up:angle     $\theta_\mathrm{up}$
+ up:frac_i    $u_i$ = (spin up)/(spin up + spin down) *before* the sample
+ up:frac_f    $u_f$ = (spin up)/(spin up + spin down) *after* the sample
 ===========   ================================================================
 
 .. note::
-    The values of the 'up_frac_i' and 'up_frac_f' must be in the range 0 to 1.
+    The values of the 'up:frac_i' and 'up:frac_f' must be in the range 0 to 1.
 
 *Document History*

sasmodels/models/spinodal.py

@@ -12 +12 @@
 where $x=q/q_0$, $q_0$ is the peak position, $I_{max}$ is the intensity 
 at $q_0$ (parameterised as the $scale$ parameter), and $B$ is a flat 
-background. The spinodal wavelength, $\Lambda$, is given by $2\pi/q_0$. 
-
-The definition of $I_{max}$ in the literature varies. Hashimoto *et al* (1991) 
-define it as 
-
-.. math::
-    I_{max} = \Lambda^3\Delta\rho^2
-    
-whereas Meier & Strobl (1987) give 
-
-.. math::
-    I_{max} = V_z\Delta\rho^2
-    
-where $V_z$ is the volume per monomer unit.
+background. The spinodal wavelength is given by $2\pi/q_0$. 
 
 The exponent $\gamma$ is equal to $d+1$ for off-critical concentration 
@@ -41 +28 @@
 
 H. Furukawa. Dynamics-scaling theory for phase-separating unmixing mixtures:
-Growth rates of droplets and scaling properties of autocorrelation functions. 
-Physica A 123, 497 (1984).
-
-H. Meier & G. Strobl. Small-Angle X-ray Scattering Study of Spinodal 
-Decomposition in Polystyrene/Poly(styrene-co-bromostyrene) Blends. 
-Macromolecules 20, 649-654 (1987).
-
-T. Hashimoto, M. Takenaka & H. Jinnai. Scattering Studies of Self-Assembling 
-Processes of Polymer Blends in Spinodal Decomposition. 
-J. Appl. Cryst. 24, 457-466 (1991).
+Growth rates of droplets and scaling properties of autocorrelation functions.
+Physica A 123,497 (1984).
 
 Revision History
@@ -56 +35 @@
 
 * **Author:**  Dirk Honecker **Date:** Oct 7, 2016
-* **Revised:** Steve King    **Date:** Oct 25, 2018
+* **Revised:** Steve King    **Date:** Sep 7, 2018
 """
 

setup.py

@@ -29 +29 @@
                 return version[1:-1]
     raise RuntimeError("Could not read version from %s/__init__.py"%package)
-
-install_requires = ['numpy', 'scipy']
-
-if sys.platform=='win32' or sys.platform=='cygwin':
-    install_requires.append('tinycc')
 
 setup(
@@ -66 +61 @@
         'sasmodels': ['*.c', '*.cl'],
     },
-    install_requires=install_requires,
+    install_requires=[
+    ],
     extras_require={
-        'full': ['docutils', 'bumps', 'matplotlib'],
-        'server': ['bumps'],
         'OpenCL': ["pyopencl"],
+        'Bumps': ["bumps"],
+        'TinyCC': ["tinycc"],
     },
     build_requires=['setuptools'],