Changeset e7678b2 in sasmodels for sasmodels/models/flexible_cylinder_ex.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_ex.c (modified) (4 diffs)

sasmodels/models/flexible_cylinder_ex.c

@@ -17 +17 @@
 elliptical_crosssection(double q, double a, double b)
 {
-    double uplim,lolim,Pi,summ,arg,zi,yyy,answer;
-    int i,nord=76;
+    double summ=0.0;
 
-    Pi = 4.0*atan(1.0);
-    lolim=0.0;
-    uplim=Pi/2.0;
-    summ=0.0;
+    for(int i=0;i<N_POINTS_76;i++) {
+        double zi = ( Gauss76Z[i] + 1.0 )*M_PI/4.0;
+        double sn, cn;
+        SINCOS(zi, sn, cn);
+        double arg = q*sqrt(a*a*sn*sn+b*b*cn*cn);
+        double yyy = pow((double)J1c(arg),2);
+        yyy *= Gauss76Wt[i];
+        summ += yyy;
+    }
 
-    for(i=0;i<nord;i++) {
-                zi = ( Gauss76Z[i]*(uplim-lolim) + uplim + lolim )/2.0;
-                arg = q*sqrt(a*a*sin(zi)*sin(zi)+b*b*cos(zi)*cos(zi));
-                yyy = pow((2.0 * J1(arg) / arg),2);
-                yyy *= Gauss76Wt[i];
-                summ += yyy;
-    }
-    answer = (uplim-lolim)/2.0*summ;
-    answer *= 2.0/Pi;
-    return(answer);
+    summ /= 2.0;
+    return(summ);
 
 }
@@ -47 +43 @@
 {
 
-        double Pi,flex,crossSect, cont;
+    double flex,crossSect, cont;
 
-        Pi = 4.0*atan(1.0);
-        cont = sld - solvent_sld;
-        crossSect = elliptical_crosssection(q,radius,(radius*axis_ratio));
+    cont = sld - solvent_sld;
+    crossSect = elliptical_crosssection(q,radius,(radius*axis_ratio));
 
-        flex = Sk_WR(q,length,kuhn_length);
-        flex *= crossSect;
-        flex *= Pi*radius*radius*axis_ratio*axis_ratio*length;
-        flex *= cont*cont;
-        flex *= 1.0e-4;
+    flex = Sk_WR(q,length,kuhn_length);
+    flex *= crossSect;
+    flex *= M_PI*radius*radius*axis_ratio*axis_ratio*length;
+    flex *= cont*cont;
+    flex *= 1.0e-4;
 
-        return flex;
+    return flex;
 }
 
@@ -71 +66 @@
 {
 
-        double result = flexible_cylinder_ex_kernel(q,
-                        length,
-                        kuhn_length,
-                        radius,
-                        axis_ratio,
-                        sld,
-                        solvent_sld);
+    double result = flexible_cylinder_ex_kernel(q,
+                    length,
+                    kuhn_length,
+                    radius,
+                    axis_ratio,
+                    sld,
+                    solvent_sld);
 
-        return result;
+    return result;
 }
 
@@ -90 +85 @@
             double solvent_sld)
 {
-        double q;
-        q = sqrt(qx*qx+qy*qy);
-        double result = flexible_cylinder_ex_kernel(q,
-                        length,
-                        kuhn_length,
-                        radius,
-                        axis_ratio,
-                        sld,
-                        solvent_sld);
+    double q;
+    q = sqrt(qx*qx+qy*qy);
+    double result = flexible_cylinder_ex_kernel(q,
+                    length,
+                    kuhn_length,
+                    radius,
+                    axis_ratio,
+                    sld,
+                    solvent_sld);
 
-        return result;
+    return result;
 }