Changes in / [5be92e8:cb97bff] in sasmodels

Location:

sasmodels/models

Files:

• adsorbed_layer.py (modified) (3 diffs)
• img/2d_q_vector.gif (added)
• img/mono_gauss_coil_1d.jpg (added)
• img/poly_gauss_coil_1d.jpg (added)
• mono_gauss_coil.py (added)
• poly_gauss_coil.py (added)

sasmodels/models/adsorbed_layer.py

@@ -24 +24 @@
 ----------
 
-S King, P Griffiths, J. Hone, and T Cosgrove, *SANS from Adsorbed Polymer Layers*,
+S King, P Griffiths, J Hone, and T Cosgrove, *SANS from Adsorbed Polymer Layers*,
 *Macromol. Symp.*, 190 (2002) 33-42.
 """
@@ -46 +46 @@
               ["density_poly", "g/cm3", 0.7, [0.0, inf], "", "Polymer density"],
               ["radius", "Ang", 500.0, [0.0, inf], "", "Particle radius"],
-              ["vol_frac", "none", 0.14, [0.0, inf], "", "Particle vol fraction"],
+              ["vol_frac", "None", 0.14, [0.0, inf], "", "Particle vol fraction"],
               ["polymer_sld", "1/Ang^2", 1.5e-06, [-inf, inf], "", "Polymer SLD"],
               ["solvent_sld", "1/Ang^2", 6.3e-06, [-inf, inf], "", "Solvent SLD"]]
@@ -60 +60 @@
     #scale by 10^10 for units conversion to cm^-1
     inten =  1.0e+10 * deltarhosqrd * ((numerator / denominator) * eterm)
-    return inten * 9.4e-13
+    return inten
 Iq.vectorized =  True  # Iq accepts an array of q values