Changeset 0a3d9b2 in sasmodels

Timestamp:

Oct 18, 2016 9:08:53 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

251f54b

Parents:

3ac4e1b

Message:

code cleanup

File:

• sasmodels/models/core_shell_ellipsoid.c (modified) (2 diffs)

sasmodels/models/core_shell_ellipsoid.c

@@ -49 +49 @@
     const double uplim = 1.0;
 
-    double summ = 0.0;   //initialize intergral
 
     const double delpc = core_sld - shell_sld; //core - shell
@@ -59 +58 @@
     const double polar_shell = radius_equat_core*x_core + thick_shell*x_polar_shell;
 
-    for(int i=0;i<N_POINTS_76;i++) {
+    double summ = 0.0;   //initialize intergral
+    for(int i=0;i<76;i++) {
         double zi = 0.5*( Gauss76Z[i]*(uplim-lolim) + uplim + lolim );
-        double yyy = Gauss76Wt[i] * gfn4(zi,
-                                  radius_equat_core,
-                                  polar_core,
-                                  equat_shell,
-                                  polar_shell,
-                                  delpc,
-                                  delps,
-                                  q);
-        summ += yyy;
+        double yyy = gfn4(zi, radius_equat_core, polar_core, equat_shell,
+                          polar_shell, delpc, delps, q);
+        summ += Gauss76Wt[i] * yyy;
     }
+    summ *= 0.5*(uplim-lolim);
 
-    double answer = 0.5*(uplim-lolim)*summ;
-    //convert to [cm-1]
-    answer *= 1.0e-4;
-
-    return answer;
+    // convert to [cm-1]
+    return 1.0e-4 * summ;
 }