Changeset e7678b2 in sasmodels for sasmodels/models/lib/Si.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/lib/Si.c (modified) (1 diff)

sasmodels/models/lib/Si.c

@@ -4 +4 @@
 double Si(double x)
 {
-        double out;
-        double pi = 4.0*atan(1.0);
+    double out;
 
-        if (x >= pi*6.2/4.0){
-                double out_sin = 0.0;
-                double out_cos = 0.0;
-                out = pi/2.0;
+    if (x >= M_PI*6.2/4.0){
+        double out_sin = 0.0;
+        double out_cos = 0.0;
+        out = M_PI/2.0;
 
-                // Explicitly writing factorial values triples the speed of the calculation
-                out_cos = 1./x - 2./pow(x,3) + 24./pow(x,5) - 720./pow(x,7);
-                out_sin = 1./pow(x,2) - 6./pow(x,4) + 120./pow(x,6) - 5040./pow(x,8);
+        // Explicitly writing factorial values triples the speed of the calculation
+        out_cos = 1./x - 2./pow(x,3) + 24./pow(x,5) - 720./pow(x,7);
+        out_sin = 1./pow(x,2) - 6./pow(x,4) + 120./pow(x,6) - 5040./pow(x,8);
 
-                out -= cos(x) * out_cos;
-                out -= sin(x) * out_sin;
-                return out;
-        }
+        out -= cos(x) * out_cos;
+        out -= sin(x) * out_sin;
+        return out;
+    }
 
-        // Explicitly writing factorial values triples the speed of the calculation
-        out = x - pow(x, 3)/18. + pow(x,5)/600. - pow(x,7)/35280. + pow(x,9)/3265920. - pow(x,11)/439084800.;
+    // Explicitly writing factorial values triples the speed of the calculation
+    out = x - pow(x, 3)/18. + pow(x,5)/600. - pow(x,7)/35280. + pow(x,9)/3265920. - pow(x,11)/439084800.;
 
-        return out;
+    return out;
 }