Changeset dd71228 in sasmodels

Timestamp:

Apr 19, 2016 7:12:41 AM (8 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:

cebbb5a

Parents:

7c20ba0

Message:

ER fucntion corected

Location:

sasmodels/models

Files:

• spherical_sld.c (modified) (2 diffs)
• spherical_sld.py (modified) (1 diff)

sasmodels/models/spherical_sld.c

@@ -140 +140 @@
                             fun = sign * 3.0 * r *
                             (2.0*qr*sinqr - (qrsq-2.0)*cosqr)/(qrsq * qrsq);
-                            // In the onioon model Jae-He's formula is rederived
+                            // In the onion model Jae-He's formula is rederived
                             // and gives following:
                             //fun = 3.0 * sign * r *
@@ -185 +185 @@
     double nu_inter[] ) {
 
-    //printf("Number of points %d\n",npts_inter);
-    double intensity;
-    //TODO: Remove this container at later stage.
-    /*double dp[60];
-    dp[0] = n_shells;
-    //This is scale will also have to be removed at some stage
-    dp[1] = 1.0;
-    dp[2] = thick_inter0;
-    dp[3] = func_inter0;
-    dp[4] = sld_core;
-    dp[5] = sld_solvent;
-    dp[6] = 0.0;
-
-    for (int i=0; i<n_shells; i++){
-        dp[i+7] = sld_flat[i];
-        dp[i+17] = thick_inter[i];
-        dp[i+27] = thick_flat[i];
-        dp[i+37] = func_inter[i];
-        dp[i+47] = nu_inter[i];
-    }
-
-    dp[57] = npts_inter;
-    dp[58] = nu_inter0;
-    dp[59] = radius_core;
-    */
-    intensity = sphere_sld_kernel(q, n_shells, npts_inter, radius_core,
+    double intensity = sphere_sld_kernel(q, n_shells, npts_inter, radius_core,
                 sld_core, sld_solvent, func_inter0, thick_inter0, nu_inter0,
                 sld_flat, thick_flat, func_inter, thick_inter, nu_inter);
-    //intensity *=1.0e-4;
-    //printf("%10d\n",intensity);
+
     return intensity;
 }

sasmodels/models/spherical_sld.py

@@ -282 +282 @@
     return np.asarray(z), np.asarray(beta)*1e-6
 
-#TODO: Not quite right I suppose
-def ER(n_shells, radius_core, thick_inter):
-    return np.sum(thick_inter[:n_shells], axis=0) + radius_core
-
-def VR(core_radius, n, thickness):
-    return 1.0, 1.0
+def ER(n_shells, radius_core, thick_inter0, thick_inter, thick_flat):
+    total_thickness = thick_inter0
+    total_thickness += np.sum(thick_inter[:n_shells], axis=0)
+    total_thickness += np.sum(thick_flat[:n_shells], axis=0)
+    return total_thickness + radius_core