Changes in / [0784c18:d634601] in sasmodels

Location:

sasmodels

Files:

• convert.py (modified) (3 diffs)
• models/mono_gauss_coil.py (modified) (5 diffs)
• models/poly_gauss_coil.py (modified) (6 diffs)

sasmodels/convert.py

@@ -129 +129 @@
             warnings.warn("parameter background not used in sasview %s"%name)
 
+
     # If it is a product model P*S, then check the individual forms for special
     # cases.  Note: despite the structure factor alone not having scale or
@@ -146 +147 @@
             for p in "La", "Lb", "Lc", "Ld":
                 if p in oldpars: oldpars[p] *= 1e-13
+        elif name == 'core_shell_parallelepiped':
+            _remove_pd(oldpars, 'rimA', name)
+        elif name in ['mono_gauss_coil','poly_gauss_coil']:
+            del oldpars['i_zero']
 
     return oldpars
@@ -177 +182 @@
         elif name == 'rpa':
             pars['case_num'] = int(pars['case_num'])
+        elif name == 'mono_gauss_coil':
+            pars['i_zero'] = 1
+        elif name == 'poly_gauss_coil':
+            pars['i_zero'] = 1
+            

sasmodels/models/mono_gauss_coil.py

@@ -14 +14 @@
 
      *I(q)* = *scale* |cdot| *I* \ :sub:`0` |cdot| *P(q)* + *background*
-         
+
 where
 
@@ -20 +20 @@
 
      *P(q)* = 2 [exp(-Z) + Z - 1] / Z \ :sup:`2`
-         
-         *Z* = (*q R* \ :sub:`g`)\ :sup:`2`
+
+     *Z* = (*q R* \ :sub:`g`)\ :sup:`2`
 
 and
 
-         *V* = *M* / (*N*\ :sub:`A` |delta|)
-         
+     *V* = *M* / (*N*\ :sub:`A` |delta|)
+
 Here, |phi|\ :sub:`poly` is the volume fraction of polymer, *V* is the volume of a polymer coil, *M* is the molecular weight of the polymer, *N*\ :sub:`A` is Avogadro's Number, |delta| is the bulk density of the polymer, |rho|\ :sub:`poly` is the sld of the polymer, |rho|\ :sub:`solv` is the sld of the solvent, and *R*\ :sub:`g` is the radius of gyration of the polymer coil.
 
@@ -52 +52 @@
 description =  """
     Evaluates the scattering from 
-        monodisperse polymer chains.
+    monodisperse polymer chains.
     """
 category =  "shape-independent"
 
 #             ["name", "units", default, [lower, upper], "type", "description"],
-parameters =  [["i_zero", "1/cm", 1.0, [-inf, inf], "", "Intensity at q=0"],
-               ["radius_gyration", "Ang", 50.0, [0.0, inf], "", "Radius of gyration"]]
+parameters =  [["i_zero", "1/cm", 70.0, [0.0, inf], "", "Intensity at q=0"],
+               ["radius_gyration", "Ang", 75.0, [0.0, inf], "", "Radius of gyration"]]
 
 # NB: Scale and Background are implicit parameters on every model
 def Iq(q, i_zero, radius_gyration):
     # pylint: disable = missing-docstring
-    z = (q * radius_gyration) ** 2
-    if q == 0:
-       inten = 1.0
+    z = (q * radius_gyration) * (q * radius_gyration)
+    if (q == 0).any():
+       inten = i_zero
     else:
        inten = i_zero * 2.0 * (exp(-z) + z - 1.0 ) / (z * z)
@@ -77 +77 @@
 
 demo =  dict(scale = 1.0,
-            i_zero = 1.0,
-            radius_gyration = 50.0,
+            i_zero = 70.0,
+            radius_gyration = 75.0,
             background = 0.0)
 
@@ -87 +87 @@
 
 tests =  [
-    [{'scale': 1.0, 'radius_gyration': 50.0, 'background': 0.0},
-     [0.0106939, 0.469418], [0.911141, 0.00362394]],
+    [{'scale': 70.0, 'radius_gyration': 75.0, 'background': 0.0},
+     [0.0106939, 0.469418], [57.1241, 0.112859]],
     ]

sasmodels/models/poly_gauss_coil.py

@@ -14 +14 @@
 
      *I(q)* = *scale* |cdot| *I* \ :sub:`0` |cdot| *P(q)* + *background*
-         
+
 where
 
@@ -20 +20 @@
 
      *P(q)* = 2 [(1 + UZ)\ :sup:`-1/U` + Z - 1] / [(1 + U) Z\ :sup:`2`]
-         
-         *Z* = [(*q R*\ :sub:`g`)\ :sup:`2`] / (1 + 2U)
-         
-         *U* = (Mw / Mn) - 1 = (*polydispersity ratio*) - 1
+
+     *Z* = [(*q R*\ :sub:`g`)\ :sup:`2`] / (1 + 2U)
+
+     *U* = (Mw / Mn) - 1 = (*polydispersity ratio*) - 1
 
 and
 
-         *V* = *M* / (*N*\ :sub:`A` |delta|)
-         
+     *V* = *M* / (*N*\ :sub:`A` |delta|)
+
 Here, |phi|\ :sub:`poly`, is the volume fraction of polymer, *V* is the volume of a polymer coil, *M* is the molecular weight of the polymer, *N*\ :sub:`A` is Avogadro's Number, |delta| is the bulk density of the polymer, |rho|\ :sub:`poly` is the sld of the polymer, |rho|\ :sub:`solv` is the sld of the solvent, and *R*\ :sub:`g` is the radius of gyration of the polymer coil.
 
@@ -57 +57 @@
 description =  """
     Evaluates the scattering from 
-        polydisperse polymer chains.
+    polydisperse polymer chains.
     """
 category =  "shape-independent"
 
 #             ["name", "units", default, [lower, upper], "type", "description"],
-parameters =  [["i_zero", "1/cm", 1.0, [-inf, inf], "", "Intensity at q=0"],
-               ["radius_gyration", "Ang", 50.0, [0.0, inf], "", "Radius of gyration"],
+parameters =  [["i_zero", "1/cm", 70.0, [0.0, inf], "", "Intensity at q=0"],
+               ["radius_gyration", "Ang", 75.0, [0.0, inf], "", "Radius of gyration"],
                ["polydispersity", "None", 2.0, [1.0, inf], "", "Polymer Mw/Mn"]]
 
@@ -69 +69 @@
 def Iq(q, i_zero, radius_gyration, polydispersity):
     # pylint: disable = missing-docstring
+    # need to trap the case of the polydispersity being 1 (ie, monodispersity)
     u = polydispersity - 1.0
-    # TO DO
-    # should trap the case of polydispersity = 1 by switching to a taylor expansion
-    minusoneonu = -1.0 / u
-    z = (q * radius_gyration) ** 2 / (1.0 + 2.0 * u)
-    if q == 0:
-        inten = i_zero * 1.0
+    if polydispersity == 1:
+       minusoneonu = -1.0 / u
     else:
-        inten = i_zero * 2.0 * (power((1.0 + u * z),minusoneonu) + z - 1.0 ) / ((1.0 + u) * (z * z))
+       minusoneonu = -1.0 / u
+    z = ((q * radius_gyration) * (q * radius_gyration)) / (1.0 + 2.0 * u)
+    if (q == 0).any():
+       inten = i_zero
+    else:
+       inten = i_zero * 2.0 * (power((1.0 + u * z),minusoneonu) + z - 1.0 ) / ((1.0 + u) * (z * z))
     return inten
-#Iq.vectorized = True # Iq accepts an array of q values
+Iq.vectorized =  True  # Iq accepts an array of q values
 
 def Iqxy(qx, qy, *args):
@@ -87 +89 @@
 
 demo =  dict(scale = 1.0,
-            i_zero = 1.0,
-            radius_gyration = 50.0,
+            i_zero = 70.0,
+            radius_gyration = 75.0,
             polydispersity = 2.0,
             background = 0.0)
@@ -99 +101 @@
 
 tests =  [
-    [{'scale': 1.0, 'radius_gyration': 50.0, 'polydispersity': 2.0, 'background': 0.0},
-     [0.0106939, 0.469418], [0.912993, 0.0054163]],
+    [{'scale': 70.0, 'radius_gyration': 75.0, 'polydispersity': 2.0, 'background': 0.0},
+     [0.0106939, 0.469418], [57.6405, 0.169016]],
     ]