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

Timestamp:

Feb 29, 2016 6: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/core_shell_ellipsoid_xt.c (modified) (3 diffs)

sasmodels/models/core_shell_ellipsoid_xt.c

@@ -30 +30 @@
                    double x_polar_shell)
 {
-        double equat_shell, polar_shell;
-    equat_shell = equat_core + t_shell;
-    polar_shell = equat_core*x_core + t_shell*x_polar_shell;
+    const double equat_shell = equat_core + t_shell;
+    const double polar_shell = equat_core*x_core + t_shell*x_polar_shell;
     double vol = 4.0*M_PI/3.0*equat_shell*equat_shell*polar_shell;
     return vol;
@@ -47 +46 @@
           double solvent_sld)
 {
-        double delpc,delps;
-        double uplim,lolim;             //upper and lower integration limits
-        double summ,zi,yyy,answer; //running tally of integration
-        double polar_core, equat_shell, polar_shell;
+    const double lolim = 0.0;
+    const double uplim = 1.0;
 
-        lolim = 0.0;
-        uplim = 1.0;
+    double summ = 0.0;   //initialize intergral
 
-        summ = 0.0;      //initialize intergral
-
-        delpc = core_sld - shell_sld; //core - shell
-        delps = shell_sld - solvent_sld; //shell - solvent
+    const double delpc = core_sld - shell_sld; //core - shell
+    const double delps = shell_sld - solvent_sld; //shell - solvent
 
 
-    polar_core = equat_core*x_core;
-    equat_shell = equat_core + t_shell;
-    polar_shell = equat_core*x_core + t_shell*x_polar_shell;
+    const double polar_core = equat_core*x_core;
+    const double equat_shell = equat_core + t_shell;
+    const double polar_shell = equat_core*x_core + t_shell*x_polar_shell;
 
-        for(int i=0;i<76;i++) {
-                zi = ( Gauss76Z[i]*(uplim-lolim) + uplim + lolim )/2.0;
-                yyy = Gauss76Wt[i] * gfn4(zi,
-                                          equat_core,
+    for(int i=0;i<N_POINTS_76;i++) {
+        double zi = ( Gauss76Z[i]*(uplim-lolim) + uplim + lolim )/2.0;
+        double yyy = Gauss76Wt[i] * gfn4(zi,
+                                  equat_core,
                                   polar_core,
                                   equat_shell,
                                   polar_shell,
-                                          delpc,
-                                          delps,
-                                          q);
-                summ += yyy;
-        }
+                                  delpc,
+                                  delps,
+                                  q);
+        summ += yyy;
+    }
 
-        answer = (uplim-lolim)/2.0*summ;
+    double answer = (uplim-lolim)/2.0*summ;
+    //convert to [cm-1]
+    answer *= 1.0e-4;
 
-        //convert to [cm-1]
-        answer *= 1.0e-4;
-
-        return answer;
+    return answer;
 }
 
@@ -98 +91 @@
           double phi)
 {
-    double cyl_x, cyl_y;
-    double cos_val;
-    double answer;
-    double sldcs,sldss;
-        double polar_core, equat_shell, polar_shell;
-
     //convert angle degree to radian
-    theta = theta * M_PI/180.0;
-    phi = phi * M_PI/180.0;
-
+    theta = theta * M_PI_180;
+    phi = phi * M_PI_180;
 
     // ellipsoid orientation, the axis of the rotation is consistent with the ploar axis.
-    cyl_x = cos(theta) * cos(phi);
-    cyl_y = sin(theta);
+    const double cyl_x = cos(theta) * cos(phi);
+    const double cyl_y = sin(theta);
 
-    sldcs = core_sld - shell_sld;
-    sldss = shell_sld- solvent_sld;
+    const double sldcs = core_sld - shell_sld;
+    const double sldss = shell_sld- solvent_sld;
 
     // Compute the angle btw vector q and the
     // axis of the cylinder
-    cos_val = cyl_x*q_x + cyl_y*q_y;
+    const double cos_val = cyl_x*q_x + cyl_y*q_y;
 
-    polar_core = equat_core*x_core;
-    equat_shell = equat_core + t_shell;
-    polar_shell = equat_core*x_core + t_shell*x_polar_shell;
+    const double polar_core = equat_core*x_core;
+    const double equat_shell = equat_core + t_shell;
+    const double polar_shell = equat_core*x_core + t_shell*x_polar_shell;
 
     // Call the IGOR library function to get the kernel:
     // MUST use gfn4 not gf2 because of the def of params.
-    answer = gfn4(cos_val,
+    double answer = gfn4(cos_val,
                   equat_core,
                   polar_core,