Changeset 7d11b81 in sasview for sansmodels/src/libigor

Timestamp:

Aug 18, 2009 11:54:39 AM (15 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3c102d4

Parents:

2cb89e7

Message:

some corrections on numbers

File:

• sansmodels/src/libigor/libCylinder.c (modified) (14 diffs)

sansmodels/src/libigor/libCylinder.c

@@ -113 +113 @@
 
                 //now calculate outer integral
-                arg = q*length*zi/2;
-                if (arg == 0){
-                        si = 1;
+                arg = q*length*zi/2.0;
+                if (arg == 0.0){
+                        si = 1.0;
                 }else{
                         si = sin(arg) * sin(arg) / arg / arg;
@@ -194 +194 @@
                 //now calculate outer integral
                 arg = q*length*zi/2;
-                if (arg == 0){
-                        si = 1;
+                if (arg == 0.0){
+                        si = 1.0;
                 }else{
                         si = sin(arg) * sin(arg) / arg / arg;
@@ -278 +278 @@
         answer *= delrho*delrho;
         //normalize by ellipsoid volume
-        answer *= 4*Pi/3*aa*bb*cc;
+        answer *= 4.0*Pi/3.0*aa*bb*cc;
         //convert to [cm-1]
         answer *= 1.0e8;
@@ -1732 +1732 @@
         vc = pi43*aa*bb*bb;
         vt = pi43*trmaj*trmin*trmin;
-        if (uq == 0){
-                siq = 1/3;
+        if (uq == 0.0){
+                siq = 1.0/3.0;
         }else{
                 siq = (sin(uq)/uq/uq - cos(uq)/uq)/uq;
         }
-        if (ut == 0){
-                sit = 1/3;
+        if (ut == 0.0){
+                sit = 1.0/3.0;
         }else{
                 sit = (sin(ut)/ut/ut - cos(ut)/ut)/ut;
@@ -1773 +1773 @@
         vc = pi43*aa*aa*bb;
         vt = pi43*trmaj*trmaj*trmin;
-        if (uq == 0){
-                siq = 1/3;
+        if (uq == 0.0){
+                siq = 1.0/3.0;
         }else{
                 siq = (sin(uq)/uq/uq - cos(uq)/uq)/uq;
         }
-        if (ut == 0){
-                sit = 1/3;
+        if (ut == 0.0){
+                sit = 1.0/3.0;
         }else{
                 sit = (sin(ut)/ut/ut - cos(ut)/ut)/ut;
@@ -1885 +1885 @@
         sinarg1 = qq*length*cos(dum);
         sinarg2 = qq*(length+facthick)*cos(dum);
-        if (besarg1 == 0){
+        if (besarg1 == 0.0){
                 be1 = 0.5;
         }else{
                 be1 = NR_BessJ1(besarg1)/besarg1;
         }
-        if (besarg2 == 0){
+        if (besarg2 == 0.0){
                 be2 = 0.5;
         }else{
                 be2 = NR_BessJ1(besarg2)/besarg2;
         }
-        if (sinarg1 == 0){
-                si1 = 1;
+        if (sinarg1 == 0.0){
+                si1 = 1.0;
         }else{
                 si1 = sin(sinarg1)/sinarg1;
         }
-        if (besarg2 == 0){
-                si2 = 1;
+        if (besarg2 == 0.0){
+                si2 = 1.0;
         }else{
                 si2 = sin(sinarg2)/sinarg2;
@@ -1934 +1934 @@
     sinarg2 = qq*(length+thick)*cos(dum);
 
-        if (besarg1 == 0){
+        if (besarg1 == 0.0){
                 be1 = 0.5;
         }else{
                 be1 = NR_BessJ1(besarg1)/besarg1;
         }
-        if (besarg2 == 0){
+        if (besarg2 == 0.0){
                 be2 = 0.5;
         }else{
                 be2 = NR_BessJ1(besarg2)/besarg2;
         }
-        if (sinarg1 == 0){
-                si1 = 1;
+        if (sinarg1 == 0.0){
+                si1 = 1.0;
         }else{
                 si1 = sin(sinarg1)/sinarg1;
         }
-        if (besarg2 == 0){
-                si2 = 1;
+        if (besarg2 == 0.0){
+                si2 = 1.0;
         }else{
                 si2 = sin(sinarg2)/sinarg2;
@@ -2024 +2024 @@
         sinarg2 = qq*(length+thick)*cos(dum);
 
-        if (besarg1 == 0){
+        if (besarg1 == 0.0){
                 be1 = 0.5;
         }else{
                 be1 = NR_BessJ1(besarg1)/besarg1;
         }
-        if (besarg2 == 0){
+        if (besarg2 == 0.0){
                 be2 = 0.5;
         }else{
                 be2 = NR_BessJ1(besarg2)/besarg2;
         }
-        if (sinarg1 == 0){
-                si1 = 1;
+        if (sinarg1 == 0.0){
+                si1 = 1.0;
         }else{
                 si1 = sin(sinarg1)/sinarg1;
         }
-        if (besarg2 == 0){
-                si2 = 1;
+        if (besarg2 == 0.0){
+                si2 = 1.0;
         }else{
                 si2 = sin(sinarg2)/sinarg2;
         }
 
-        t1 = 2*area*(2*length)*dr1*(si1)*(be1);
-        t2 = 2*area*dr2*(totald*si2-2*length*si1)*(be2);
+        t1 = 2.0*area*(2.0*length)*dr1*(si1)*(be1);
+        t2 = 2.0*area*dr2*(totald*si2-2.0*length*si1)*(be2);
 
         retval =((t1+t2)*(t1+t2))*sin(dum);
@@ -2139 +2139 @@
     nu = nua/a;
     arg = qq*a*sqrt(1+dum*dum*(nu*nu-1));
-    if (arg == 0){
-        retval =1/3;
+    if (arg == 0.0){
+        retval =1.0/3.0;
     }else{
         retval = (sin(arg)-arg*cos(arg))/(arg*arg*arg);
     }
     retval *= retval;
-    retval *= 9;
+    retval *= 9.0;
 
     return(retval);
@@ -2158 +2158 @@
     arg1 = qq*rshell*sqrt(1-dum*dum);           //1=shell (outer radius)
     arg2 = qq*rcore*sqrt(1-dum*dum);                    //2=core (inner radius)
-    if (arg1 == 0){
-        lam1 = 1;
+    if (arg1 == 0.0){
+        lam1 = 1.0;
     }else{
-        lam1 = 2*NR_BessJ1(arg1)/arg1;
+        lam1 = 2.0*NR_BessJ1(arg1)/arg1;
     }
-    if (arg2 == 0){
-        lam2 = 1;
+    if (arg2 == 0.0){
+        lam2 = 1.0;
     }else{
-        lam2 = 2*NR_BessJ1(arg2)/arg2;
+        lam2 = 2.0*NR_BessJ1(arg2)/arg2;
     }
     //Todo: Need to check psi behavior as gamma goes to 1.
-    psi = 1/(1-gamma*gamma)*(lam1 -  gamma*gamma*lam2);         //SRK 10/19/00
-    sinarg = qq*length*dum/2;
-    if (sinarg == 0){
-        t2 = 1;
+    psi = 1.0/(1.0-gamma*gamma)*(lam1 -  gamma*gamma*lam2);             //SRK 10/19/00
+    sinarg = qq*length*dum/2.0;
+    if (sinarg == 0.0){
+        t2 = 1.0;
     }else{
         t2 = sin(sinarg)/sinarg;
@@ -2193 +2193 @@
     arg1 = (mu/2)*cos(Pi*uu/2);
     arg2 = (mu*aa/2)*sin(Pi*uu/2);
-    if(arg1==0) {
-                tmp1 = 1;
+    if(arg1==0.0) {
+                tmp1 = 1.0;
         } else {
                 tmp1 = sin(arg1)*sin(arg1)/arg1/arg1;
     }
 
-    if (arg2==0) {
-                tmp2 = 1;
+    if (arg2==0.0) {
+                tmp2 = 1.0;
         } else {
                 tmp2 = sin(arg2)*sin(arg2)/arg2/arg2;
@@ -2222 +2222 @@
     arg += cc*cc*dy*dy;
     arg = q*sqrt(arg);
-    if (arg == 0){
-        val = 1; // as arg --> 0, val should go to 1.0
+    if (arg == 0.0){
+        val = 1.0; // as arg --> 0, val should go to 1.0
     }else{
-        val = 9 * ( (sin(arg) - arg*cos(arg))/(arg*arg*arg) ) * ( (sin(arg) - arg*cos(arg))/(arg*arg*arg) );
+        val = 9.0 * ( (sin(arg) - arg*cos(arg))/(arg*arg*arg) ) * ( (sin(arg) - arg*cos(arg))/(arg*arg*arg) );
     }
     return (val);
@@ -2259 +2259 @@
     d1 = qq * rr * sin(theta);
     b2 = d1 * d1;
-    if (besarg == 0){
+    if (besarg == 0.0){
         be = sin(theta);
     }else{
         be = t2 / b2;
     }
-    if (siarg == 0){
-        si = 1;
+    if (siarg == 0.0){
+        si = 1.0;
     }else{
         si = t1 / b1;
@@ -2287 +2287 @@
 
         arg = qq*ra*sqrt((1+nu*nu)/2+(1-nu*nu)*cos(theta)/2);
-        if (arg == 0){
-                retval = 1;
+        if (arg == 0.0){
+                retval = 1.0;
         }else{
-                retval = 2*NR_BessJ1(arg)/arg;
+                retval = 2.0*NR_BessJ1(arg)/arg;
         }