Changeset 07142f3 in sasmodels

Timestamp:

Mar 17, 2016 7:10:38 AM (9 years ago)

Author:

wojciech

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:

38daeec

Parents:

16afd49

Message:

ifdef corrected in bessel functions

Location:

sasmodels/models

Files:

• bessel.py (added)
• lib/j0d.c (modified) (3 diffs)
• lib/j1d.c (modified) (3 diffs)
• lib/jnd.c (modified) (4 diffs)

sasmodels/models/lib/j0d.c

@@ -99 +99 @@
 
 //Cephes single precission
-if ( FLOAT_SIZE>4 ) {
+#if FLOAT_SIZE>4
     double w, z, p, q, xn;
 
@@ -222 +222 @@
 
     return( p * SQ2OPI / sqrt(x) );
-}
 //Cephes single precission
-else {
+#else
     double xx, w, z, p, q, xn;
 
@@ -299 +298 @@
     p = p * cosf(xn + xx);
     return(p);
+#endif
+
 }
-}
-
-
+
+

sasmodels/models/lib/j1d.c

@@ -81 +81 @@
 
 //Cephes double pression function
-if (FLOAT_SIZE>4) {
+#if FLOAT_SIZE>4
 
     double w, z, p, q, xn;
@@ -183 +183 @@
     return( p * SQ2OPI / sqrt(x) );
 
-}
+
 //Single precission version of cephes
-else {
+#else
     double xx, w, z, p, q, xn;
 
@@ -245 +245 @@
 
     return(p);
+#endif
 }
-}
-
+

sasmodels/models/lib/jnd.c

@@ -82 +82 @@
             return( 0.0 );
 
-    if (FLOAT_SIZE > 4)
+    #if FLOAT_SIZE > 4
         k = 53;
-    else
+    #else
         k = 24;
+    #endif
 
     pk = 2 * (n + k);
@@ -100 +101 @@
     pk = 1.0;
 
-    if (FLOAT_SIZE > 4) {
+    #if FLOAT_SIZE > 4
         ans = x/ans;
         pkm1 = 1.0/ans;
@@ -120 +121 @@
 
             return( sign * ans );
-        }
-    else {
+
+    #else
         xinv = 1.0/x;
         pkm1 = ans * xinv;
@@ -147 +148 @@
                 ans = sign * j0(x)/pkm1;
         return( ans );
-    }
+    #endif
 }