Changeset b135dc0 in sasmodels

Timestamp:

Mar 16, 2016 8:28:50 AM (9 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:

5b2930f

Parents:

4a4ae41

Message:

Reset scaling to match SANDRA calculation - NB: this gives different
intensity to SasView?

File:

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

sasmodels/models/adsorbed_layer.py

@@ -50 +50 @@
               ["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"]]
@@ -64 +64 @@
     #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