Changes in / [3fc4097:bbb887d] in sasmodels

Files:

• doc/guide/magnetism/magnetism.rst (modified) (2 diffs)
• doc/guide/plugin.rst (modified) (1 diff)
• sasmodels/kernel_iq.c (modified) (1 diff)
• sasmodels/models/mass_surface_fractal.py (modified) (5 diffs)

doc/guide/magnetism/magnetism.rst

@@ -39 +39 @@
 
 .. math::
-    -- &= (1-u_i)(1-u_f) \\
-    -+ &= (1-u_i)(u_f) \\
-    +- &= (u_i)(1-u_f) \\
-    ++ &= (u_i)(u_f)
+    -- &= ((1-u_i)(1-u_f))^{1/4} \\
+    -+ &= ((1-u_i)(u_f))^{1/4} \\
+    +- &= ((u_i)(1-u_f))^{1/4} \\
+    ++ &= ((u_i)(u_f))^{1/4}
 
 Ideally the experiment would measure the pure spin states independently and
@@ -104 +104 @@
 | 2015-05-02 Steve King
 | 2017-11-15 Paul Kienzle
-| 2018-06-02 Adam Washington

doc/guide/plugin.rst

@@ -822 +822 @@
 
         :code:`source = ["lib/Si.c", ...]`
-        (`Si.c <https://github.com/SasView/sasmodels/tree/master/sasmodels/models/lib/sas_Si.c>`_)
+        (`Si.c <https://github.com/SasView/sasmodels/tree/master/sasmodels/models/lib/Si.c>`_)
 
     sas_3j1x_x(x):

sasmodels/kernel_iq.c

@@ -83 +83 @@
   in_spin = clip(in_spin, 0.0, 1.0);
   out_spin = clip(out_spin, 0.0, 1.0);
-  // Previous version of this function took the square root of the weights,
-  // under the assumption that 
-  //
+  // Note: sasview 3.1 scaled all slds by sqrt(weight) and assumed that
   //     w*I(q, rho1, rho2, ...) = I(q, sqrt(w)*rho1, sqrt(w)*rho2, ...)
-  //
-  // However, since the weights are applied to the final intensity and
-  // are not interned inside the I(q) function, we want the full
-  // weight and not the square root.  Any function using
-  // set_spin_weights as part of calculating an amplitude will need to
-  // manually take that square root, but there is currently no such
-  // function.
-  weight[0] = (1.0-in_spin) * (1.0-out_spin); // dd
-  weight[1] = (1.0-in_spin) * out_spin;       // du
-  weight[2] = in_spin * (1.0-out_spin);       // ud
-  weight[3] = in_spin * out_spin;             // uu
+  // which is likely to be the case for simple models.
+  weight[0] = sqrt((1.0-in_spin) * (1.0-out_spin)); // dd
+  weight[1] = sqrt((1.0-in_spin) * out_spin);       // du.real
+  weight[2] = sqrt(in_spin * (1.0-out_spin));       // ud.real
+  weight[3] = sqrt(in_spin * out_spin);             // uu
   weight[4] = weight[1]; // du.imag
   weight[5] = weight[2]; // ud.imag

sasmodels/models/mass_surface_fractal.py

@@ -39 +39 @@
     The surface ( $D_s$ ) and mass ( $D_m$ ) fractal dimensions are only
     valid if $0 < surface\_dim < 6$ , $0 < mass\_dim < 6$ , and
-    $(surface\_dim + mass\_dim ) < 6$ . 
-    Older versions of sasview may have the default primary particle radius
-    larger than the cluster radius, this was an error, also present in the 
-    Schmidt review paper below. The primary particle should be the smaller 
-    as described in the original Hurd et.al. who also point out that 
-    polydispersity in the primary particle sizes may affect their 
-    apparent surface fractal dimension.
-    
+    $(surface\_dim + mass\_dim ) < 6$ .
+
 
 References
 ----------
 
-.. [#] P Schmidt, *J Appl. Cryst.*, 24 (1991) 414-435 Equation(19)
-.. [#] A J Hurd, D W Schaefer, J E Martin, *Phys. Rev. A*,
-   35 (1987) 2361-2364 Equation(2)
+P Schmidt, *J Appl. Cryst.*, 24 (1991) 414-435 Equation(19)
 
-Authorship and Verification
-----------------------------
-
-* **Converted to sasmodels by:** Piotr Rozyczko **Date:** Jan 20, 2016
-* **Last Reviewed by:** Richard Heenan **Date:** May 30, 2018
+A J Hurd, D W Schaefer, J E Martin, *Phys. Rev. A*,
+35 (1987) 2361-2364 Equation(2)
 """
 
@@ -78 +67 @@
         rg_primary    =  rg
         background   =  background
+        Ref: Schmidt, J Appl Cryst, eq(19), (1991), 24, 414-435
         Hurd, Schaefer, Martin, Phys Rev A, eq(2),(1987),35, 2361-2364
         Note that 0 < Ds< 6 and 0 < Dm < 6.
@@ -88 +78 @@
     ["fractal_dim_mass", "",      1.8, [0.0, 6.0], "", "Mass fractal dimension"],
     ["fractal_dim_surf", "",      2.3, [0.0, 6.0], "", "Surface fractal dimension"],
-    ["rg_cluster",       "Ang", 4000., [0.0, inf], "", "Cluster radius of gyration"],
-    ["rg_primary",       "Ang",  86.7, [0.0, inf], "", "Primary particle radius of gyration"],
+    ["rg_cluster",       "Ang",  86.7, [0.0, inf], "", "Cluster radius of gyration"],
+    ["rg_primary",       "Ang", 4000., [0.0, inf], "", "Primary particle radius of gyration"],
 ]
 # pylint: enable=bad-whitespace, line-too-long
@@ -117 +107 @@
             fractal_dim_mass=1.8,
             fractal_dim_surf=2.3,
-            rg_cluster=4000.0,
-            rg_primary=86.7)
+            rg_cluster=86.7,
+            rg_primary=4000.0)
 
 tests = [
 
-    # Accuracy tests based on content in test/utest_other_models.py  All except first, changed so rg_cluster is the larger, RKH 30 May 2018
-    [{'fractal_dim_mass':   1.8,
+    # Accuracy tests based on content in test/utest_other_models.py
+    [{'fractal_dim_mass':      1.8,
       'fractal_dim_surf':   2.3,
       'rg_cluster':   86.7,
@@ -133 +123 @@
     [{'fractal_dim_mass':      3.3,
       'fractal_dim_surf':   1.0,
-      'rg_cluster': 4000.0,
-      'rg_primary':   90.0,
-     }, 0.001, 0.0932516614456],
+      'rg_cluster':   90.0,
+      'rg_primary': 4000.0,
+     }, 0.001, 0.18562699016],
 
     [{'fractal_dim_mass':      1.3,
-      'fractal_dim_surf':   2.0,
-      'rg_cluster': 2000.0,
-      'rg_primary':   90.0,
+      'fractal_dim_surf':   1.0,
+      'rg_cluster':   90.0,
+      'rg_primary': 2000.0,
       'background':    0.8,
-     }, 0.001, 1.28296431786],
+     }, 0.001, 1.16539753641],
 
     [{'fractal_dim_mass':      2.3,
-      'fractal_dim_surf':   3.1,
-      'rg_cluster':  1000.0,
-      'rg_primary':  30.0,
+      'fractal_dim_surf':   1.0,
+      'rg_cluster':   90.0,
+      'rg_primary': 1000.0,
       'scale':        10.0,
       'background':    0.0,
-     }, 0.051, 0.00333804044899],
+     }, 0.051, 0.000169548800377],
     ]