Changeset e664a11 in sasmodels

Timestamp:

Mar 22, 2016 12:20:45 PM (9 years ago)

Author:

richardh

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:

6b4f7f6

Parents:

693570c

Message:

stacked_disks fails compare, even before rkh edited it, will investigate

File:

• sasmodels/models/stacked_disks.py (modified) (11 diffs)

sasmodels/models/stacked_disks.py

@@ -65 +65 @@
 
 where *n* = the total number of the disc stacked (n_stacking),
-*D* = the next neighbor center-to-center distance (d-spacing),
+*D* = 2*(*d*+*h*)the next neighbor center-to-center distance (d-spacing),
 and $\sigma_D$ = the Gaussian standard deviation of the d-spacing (sigma_d).
 
 .. note::
-    The 2nd virial coefficient of the cylinder is calculated based on the
+    Each assmebly in the stack is layer/core/layer, so the spacing of the cores
+    is core plus two layers. The 2nd virial coefficient of the cylinder is 
+    calculated based on the 
     *radius* and *length* = *n_stacking* * (*core_thick* + 2 * *layer_thick*)
     values, and used as the effective radius for $S(Q)$ when $P(Q) * S(Q)$
@@ -89 +91 @@
 by the NIST Center for Neutron Research (Kline, 2006)
 
-Reference
----------
+References
+----------
 
 A Guinier and G Fournet, *Small-Angle Scattering of X-Rays*, John Wiley and Sons, New York, 1955
@@ -109 +111 @@
     core_thick = thickness of the core
     layer_thick = thickness of a layer
-    core_sld = the SLD of the core
-    layer_sld = the SLD of the layers
+    sld_core = the SLD of the core
+    sld_layer = the SLD of the layers
     n_stacking = the number of the disks
     sigma_d =  Gaussian STD of d-spacing
-    solvent_sld = the SLD of the solvent
+    sld_solvent = the SLD of the solvent
     """
 category = "shape:cylinder"
@@ -121 +123 @@
 parameters = [
     ["core_thick",  "Ang",        10.0, [0, inf],    "volume",      "Thickness of the core disk"],
-    ["layer_thick", "Ang",        10.0, [0, inf],    "volume",      "Thickness of the stacked disk"],
+    ["layer_thick", "Ang",        10.0, [0, inf],    "volume",      "Thickness of layer each side of core"],
     ["radius",      "Ang",        15.0, [0, inf],    "volume",      "Radius of the stacked disk"],
-    ["n_stacking",  "",            1.0, [0, inf],    "volume",      "Number of stacking"],
+    ["n_stacking",  "",            1.0, [0, inf],    "volume",      "Number of stacked layer/core/layer disks"],
     ["sigma_d",     "Ang",         0,   [0, inf],    "",            "GSD of disks sigma_d"],
-    ["core_sld",    "1e-6/Ang^2",  4,   [-inf, inf], "",            "Core scattering length density"],
-    ["layer_sld",   "1e-6/Ang^2",  0.0, [-inf, inf], "",            "Layer scattering length density"],
-    ["solvent_sld", "1e-6/Ang^2",  5.0, [-inf, inf], "",            "Solvent scattering length density"],
+    ["sld_core",    "1e-6/Ang^2",  4,   [-inf, inf], "",            "Core scattering length density"],
+    ["sld_layer",   "1e-6/Ang^2",  0.0, [-inf, inf], "",            "Layer scattering length density"],
+    ["sld_solvent", "1e-6/Ang^2",  5.0, [-inf, inf], "",            "Solvent scattering length density"],
     ["theta",       "degrees",     0,   [-inf, inf], "orientation", "Orientation of the stacked disk axis w/respect incoming beam"],
     ["phi",         "degrees",     0,   [-inf, inf], "orientation", "Orientation of the stacked disk in the plane of the detector"],
@@ -142 +144 @@
             n_stacking=1,
             sigma_d=0,
-            core_sld=4,
-            layer_sld=0.0,
-            solvent_sld=5.0,
+            sld_core=4,
+            sld_layer=0.0,
+            sld_solvent=5.0,
             theta=0,
             phi=0)
@@ -151 +153 @@
 oldname = 'StackedDisksModel'
 
-oldpars = dict(theta='axis_theta',
+oldpars = dict(sld_core='core_sld',sld_layer='layer_sld',sld_solvent='solvent_sld',n_stacking='n_stacking',theta='axis_theta',
                phi='axis_phi')
 
@@ -161 +163 @@
       'n_stacking': 1.0,
       'sigma_d': 0.0,
-      'core_sld': 4.0,
-      'layer_sld': -0.4,
+      'sld_core': 4.0,
+      'sld_layer': -0.4,
       'solvent_sd': 5.0,
       'theta': 0.0,
@@ -175 +177 @@
       'n_stacking': 1.0,
       'sigma_d': 0.0,
-      'core_sld': 4.0,
-      'layer_sld': -0.4,
+      'sld_core': 4.0,
+      'sld_layer': -0.4,
       'solvent_sd': 5.0,
       'theta': 0.0,
@@ -189 +191 @@
       'n_stacking': 1.0,
       'sigma_d': 0.0,
-      'core_sld': 4.0,
-      'layer_sld': -0.4,
+      'sld_core': 4.0,
+      'sld_layer': -0.4,
       'solvent_sd': 5.0,
       'theta': 0.0,
@@ -203 +205 @@
       'n_stacking': 1.0,
       'sigma_d': 0.0,
-      'core_sld': 4.0,
-      'layer_sld': -0.4,
+      'sld_core': 4.0,
+      'sld_layer': -0.4,
       'solvent_sd': 5.0,
       'theta': 0.0,
@@ -212 +214 @@
      }, ([1.3, 1.57]), [0.0010039, 0.0010038]],
     ]
-
-
+# 21Mar2016   RKH notes that unit tests all have n_stacking=1, ought to test other values
+