Changeset b7529e2 in sasmodels

Timestamp:

Feb 24, 2016 7:43:51 AM (8 years ago)

Author:

piotr

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:

103ea45

Parents:

8b9adb5

Message:

Code review from PK

Location:

sasmodels/models

Files:

• multi_shell.c (modified) (4 diffs)
• multi_shell.py (modified) (1 diff)

sasmodels/models/multi_shell.c

@@ -1 @@
-double form_volume(void);
-
 double Iq(double q,
           double core_radius,
@@ -18 +16 @@
 
 static
-double F_func(double qr) {
-        double sc;
-
-    if (qr > 0.1){
-        double sn, cn;
-        SINCOS(qr, sn, cn);
-        sc = (3.0*(sn - qr*cn)/(qr*qr*qr));
-    } else{
-        // herbie.uwplse.org/demo low-q solution for the above.
-        sc = 1.0 + 0.0035714285714285718*(qr*qr*qr*qr) - 0.1*qr*qr;
-    }
-
-        return sc;
-}
-static
 double multi_shell_kernel(double q,
           double core_radius,
@@ -42 +25 @@
 {
         //calculate with a loop, two shells at a time
-        int ii=0;
-        double fval=0.0;
-        double voli = 0.0;
+    int ii=0;
+    double fval=0.0;
+    double voli = 0.0;
     const double sldi = core_sld-shell_sld;
 
-        do {
-                double ri = core_radius + (double)ii*(s_thickness + w_thickness);
+    do {
+        double ri = core_radius + (double)ii*(s_thickness + w_thickness);
 
         // layer 1
-                voli = 4.0*M_PI/3.0*ri*ri*ri;
-                fval += voli*sldi*F_func(ri*q);
+        voli = 4.0*M_PI/3.0*ri*ri*ri;
+        fval += voli*sldi*sph_j1c(ri*q);
 
-                ri += s_thickness;
+        ri += s_thickness;
 
         // layer 2
-                voli = 4.0*M_PI/3.0*ri*ri*ri;
-                fval -= voli*sldi*F_func(ri*q);
+        voli = 4.0*M_PI/3.0*ri*ri*ri;
+        fval -= voli*sldi*sph_j1c(ri*q);
 
         //do 2 layers at a time
-                ii+=1;
+        ii+=1;
 
         } while(ii<=n_pairs-1);  //change to make 0 < n_pairs < 2 correspond to
@@ -68 +51 @@
     fval *= 1.0e-4*fval/voli;
 
-        return(fval);
-}
-
-double form_volume(void){
-    return NAN;
+    return(fval);
 }
 

sasmodels/models/multi_shell.py

@@ -67 +67 @@
 # pylint: enable=bad-whitespace, line-too-long
 
-source = ["multi_shell.c"]
+source = ["lib/sph_j1c.c", "multi_shell.c"]
+
+polydispersity = ["core_radius", "n_pairs"]
 
 demo = dict(scale=1, background=0,