Changeset 3703fde in sasmodels

Timestamp:

Mar 21, 2016 5:05:31 AM (9 years ago)

Author:

wojciech

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:

2be86e2, 3a45c2c

Parents:

d2bcaf4 (diff), 1e9a108 (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

Location:

sasmodels/models

Files:

• polymer_micelle.py (moved) (moved from sasmodels/models/micelle_spherical_core.py) (3 diffs)
• polymer_micelle_kernel.c (moved) (moved from sasmodels/models/micelle_spherical_core.c)
• raspberry.c (modified) (1 diff)
• img/spherical_sld_1d.jpg (added)
• img/spherical_sld_default_profile.jpg (added)
• img/spherical_sld_profile.gif (added)

sasmodels/models/polymer_micelle.py

@@ -27 +27 @@
 from numpy import inf
 
-name = "micelle_spherical_core"
-title = "Micelle Spherical Core model"
+name = "polymer_micelle"
+title = "Polymer micelle model"
 description = """
-    This model provides the form factor, $P(q)$, for a micelle with
-    a spherical core and Gaussian polymer chains attached to the surface.
+    This model provides an approximate form factor, P(q), for a micelle with
+    a spherical core with Gaussian polymer chains attached to the surface.
     """
-category = "shape-independent"
+category = "shape:sphere"
 
 # pylint: disable=bad-whitespace, line-too-long
@@ -51 +51 @@
 # pylint: enable=bad-whitespace, line-too-long
 
-source = ["lib/sph_j1c.c", "micelle_spherical_core.c"]
+source = ["lib/sph_j1c.c", "polymer_micelle_kernel.c"]
 
 demo = dict(scale=1, background=0,
@@ -75 +75 @@
     ]
 # RKH 20Mar2016 - need to check whether the core & corona volumes are per monomer ??? and how aggregation number works!
+# renamed from micelle_spherical_core to polymer_micelle, moved from shape-independent to spheres section.
+# Ought to be able to add polydisp to core? And add ability to x by S(Q) ?

sasmodels/models/raspberry.c

@@ -27 +27 @@
 
 
-    double vfL, rL, sldL, vfS, rS, sldS, deltaS, delrhoL, delrhoS, sldSolv, aSs;
+    double vfL, rL, sldL, vfS, rS, sldS, deltaS, delrhoL, delrhoS, sldSolv;
     double VL, VS, Np, f2, fSs;
     double psiL,psiS;
-    double sfLS,sfSS,Np2,fSs2;
+    double sfLS,sfSS;
     double slT;