Changeset 40a87fa in sasmodels for sasmodels/models/elliptical_cylinder.c

Timestamp:

Aug 8, 2016 11:24:11 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

2472141

Parents:

2d65d51

Message:

lint and latex cleanup

File:

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

sasmodels/models/elliptical_cylinder.c

@@ -19 +19 @@
 
     arg = q*r_minor*sqrt((1.0+r_ratio*r_ratio)/2+(1.0-r_ratio*r_ratio)*cos(theta)/2);
-    if (arg == 0.0){
-        retval = 1.0;
-    }else{
-        //retval = 2.0*NR_BessJ1(arg)/arg;
-        retval = sas_J1c(arg);
-    }
+    //retval = 2.0*J1(arg)/arg;
+    retval = sas_J1c(arg);
     return retval*retval ;
 }
@@ -68 +64 @@
         //now calculate the value of the inner integral
         answer = (vbj-vaj)/2.0*summj;
-        //divide integral by Pi
-        answer /= M_PI;
 
         //now calculate outer integral
         arg = q*length*zi/2.0;
-        if (arg == 0.0){
-            si = 1.0;
-        }else{
-            si = sin(arg) * sin(arg) / arg / arg;
-        }
+        si = square(sinc(arg));
         yyy = Gauss76Wt[i] * answer * si;
         summ += yyy;
     }
 
-    answer = (vb-va)/2.0*summ;
+    //divide integral by Pi
+    answer = (vb-va)/2.0*summ/M_PI;
     // Multiply by contrast^2
     answer *= delrho*delrho;