Changeset cb97bff in sasmodels for sasmodels/models/mono_gauss_coil.py

Timestamp:

Mar 16, 2016 4:59:52 PM (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:

310ddcb, bf227cd

Parents:

38d2c97 (diff), 5be92e8 (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

Conflicts:

sasmodels/models/adsorbed_layer.py

File:

• sasmodels/models/mono_gauss_coil.py (modified) (2 diffs)

sasmodels/models/mono_gauss_coil.py

@@ -6 +6 @@
 
 r"""
-This model strictly describes the scattering from *monodisperse* polymer chains in theta solvents or polymer melts, conditions under which the distances between segments follow a Gaussian distribution. Provided the number of segments is large (ie, high molecular weight polymers) the single-chain Form Factor P(Q) is that described by Debye (1947).
+This model strictly describes the scattering from *monodisperse* polymer chains in theta solvents or polymer melts, conditions under which the distances between segments follow a Gaussian distribution. Provided the number of segments is large (ie, high molecular weight polymers) the single-chain form factor P(Q) is that described by Debye (1947).
 
 To describe the scattering from *polydisperse* polymer chains, see the poly_gauss_coil model.
@@ -13 +13 @@
 ----------
 
-     *I(q)* = *scale* x *P(q)* + *background*
+     *I(q)* = *scale* |cdot| *P(q)* + *background*
          
 where
 
-     *scale* = |phi|\ :sub:`poly` x *V* x (|rho|\ :sub:`poly` - |rho|\ :sub:`solv`)\ :sup:'2'
+     *scale* = |phi|\ :sub:`poly` |cdot| *V* |cdot| (|rho|\ :sub:`poly` - |rho|\ :sub:`solv`)\  :sup:`2`
 
-     *P(q)* = 2 [exp(-Z) + Z - 1] / Z\ :sup:'2'
+     *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.
+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.
 
 .. figure:: img/mono_gauss_coil_1d.jpg