Changeset e7678b2 in sasmodels for sasmodels/models/flexible_cylinder.c

Timestamp:

Feb 29, 2016 8:21:55 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:

73860b6

Parents:

deac08c

Message:

Code review from PAK

File:

• sasmodels/models/flexible_cylinder.c (modified) (3 diffs)

sasmodels/models/flexible_cylinder.c

@@ -22 +22 @@
 {
 
-        double Pi = 4.0*atan(1.0);
-
-        double cont = sld-solvent_sld;
-        double qr = q*radius;
-        double flex = Sk_WR(q,length,kuhn_length);
-    double crossSect = (2.0*J1(qr)/qr)*(2.0*J1(qr)/qr);
-
-        flex *= crossSect;
-        flex *= Pi*radius*radius*length;
-        flex *= cont*cont;
-        flex *= 1.0e-4;
-
-        return flex;
+    const double cont = sld-solvent_sld;
+    const double qr = q*radius;
+    //const double crossSect = (2.0*J1(qr)/qr)*(2.0*J1(qr)/qr);
+    const double crossSect = J1c(qr);
+    double flex = Sk_WR(q,length,kuhn_length);
+    flex *= crossSect*crossSect;
+    flex *= M_PI*radius*radius*length;
+    flex *= cont*cont;
+    flex *= 1.0e-4;
+    return flex;
 }
 
@@ -45 +42 @@
 {
 
-        double result = flexible_cylinder_kernel(q, length, kuhn_length, radius, sld, solvent_sld);
-
-        return result;
+    double result = flexible_cylinder_kernel(q, length, kuhn_length, radius, sld, solvent_sld);
+    return result;
 }
 
@@ -57 +53 @@
             double solvent_sld)
 {
-        double q;
-        q = sqrt(qx*qx+qy*qy);
-        double result = flexible_cylinder_kernel(q, length, kuhn_length, radius, sld, solvent_sld);
+    double q;
+    q = sqrt(qx*qx+qy*qy);
+    double result = flexible_cylinder_kernel(q, length, kuhn_length, radius, sld, solvent_sld);
 
-        return result;
+    return result;
 }