Changeset a776125 in sasmodels for sasmodels/models/lib

Timestamp:

Mar 19, 2016 9:45:45 AM (8 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:

d7baa51

Parents:

70534131

Message:

Bessel functions named changed

Location:

sasmodels/models/lib

Files:

• sas_J0.c (moved) (moved from sasmodels/models/lib/j0_cephes.c) (1 diff)
• sas_J1.c (moved) (moved from sasmodels/models/lib/j1_cephes.c) (1 diff)
• sas_JN.c (moved) (moved from sasmodels/models/lib/jn_cephes.c) (4 diffs)

sasmodels/models/lib/sas_J0.c

@@ -177 +177 @@
  };
 
-double J0(double x) {
+double sas_J0(double x) {
 
 //Cephes single precission

sasmodels/models/lib/sas_J1.c

@@ -135 +135 @@
     };
 
-double J1(double x) {
+double sas_J1(double x) {
 
 //Cephes double pression function

sasmodels/models/lib/sas_JN.c

@@ -48 +48 @@
 */
 
-double jn( int n, double x );
+double sas_JN( int n, double x );
 
-double jn( int n, double x ) {
+double sas_JN( int n, double x ) {
 
     const double MACHEP = 1.11022302462515654042E-16;
@@ -73 +73 @@
 
     if( n == 0 )
-            return( sign * j0(x) );
+            return( sign * sas_J0(x) );
     if( n == 1 )
-            return( sign * j1(x) );
+            return( sign * sas_J1(x) );
     if( n == 2 )
-            return( sign * (2.0 * j1(x) / x  -  j0(x)) );
+            return( sign * (2.0 * sas_J1(x) / x  -  sas_J0(x)) );
 
     if( x < MACHEP )
@@ -116 +116 @@
 
         if( fabs(pk) > fabs(pkm1) )
-                ans = j1(x)/pk;
+                ans = sas_J1(x)/pk;
         else
-                ans = j0(x)/pkm1;
+                ans = sas_J0(x)/pkm1;
 
             return( sign * ans );
@@ -144 +144 @@
 
         if( r > ans )  /* if( fabs(pk) > fabs(pkm1) ) */
-                ans = sign * j1(x)/pk;
+                ans = sign * sas_J1(x)/pk;
         else
-                ans = sign * j0(x)/pkm1;
+                ans = sign * sas_J0(x)/pkm1;
         return( ans );
     #endif