Changeset 473a9f1 in sasmodels

Timestamp:

Jan 11, 2017 5:31:27 AM (7 years ago)

Author:

wojciech

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

1e7b0db0

Parents:

fcb33e4

Message:

Changed function and files names in lib to comply with new standards

Location:

sasmodels/models/lib

Files:

• sas_3j1x_x.c (moved) (moved from sasmodels/models/lib/sph_j1c.c) (2 diffs)
• sas_J1.c (modified) (1 diff)
• sas_Si.c (moved) (moved from sasmodels/models/lib/Si.c) (1 diff)

sasmodels/models/lib/sas_3j1x_x.c

@@ -7 +7 @@
 * using double precision that are the source.
 */
-double sph_j1c(double q);
+double sas_3j1x_x(double q);
 
 // The choice of the number of terms in the series and the cutoff value for
@@ -44 +44 @@
 #endif
 
-double sph_j1c(double q)
+double sas_3j1x_x(double q)
 {
     if (q < SPH_J1C_CUTOFF) {

sasmodels/models/lib/sas_J1.c

@@ -217 +217 @@
 
 //Finally J1c function that equals 2*J1(x)/x
-double sas_J1c(double x);
-double sas_J1c(double x)
+double sas_2J1x_x(double x);
+double sas_2J1x_x(double x)
 {
     return (x != 0.0 ) ? 2.0*sas_J1(x)/x : 1.0;

sasmodels/models/lib/sas_Si.c

@@ -1 +1 @@
 // integral of sin(x)/x Taylor series approximated to w/i 0.1%
-double Si(double x);
-double Si(double x)
+double sas_Si(double x);
+double sas_Si(double x)
 {
     if (x >= M_PI*6.2/4.0) {