Changeset 07646b6 in sasmodels for sasmodels/models/lib
- Timestamp:
- Oct 25, 2018 3:43:01 PM (6 years ago)
- Branches:
- master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
- Children:
- 149eb53
- Parents:
- 31fc4ad (diff), d5ce7fa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - git-author:
- Paul Kienzle <pkienzle@…> (10/25/18 14:41:48)
- git-committer:
- Paul Kienzle <pkienzle@…> (10/25/18 15:43:01)
- Location:
- sasmodels/models/lib
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/models/lib/gauss76.c
r99b84ec r74e9b5f 11 11 12 12 // Gaussians 13 constant double Gauss76Wt[76] ={13 constant double Gauss76Wt[76] = { 14 14 .00126779163408536, //0 15 15 .00294910295364247, … … 90 90 }; 91 91 92 constant double Gauss76Z[76] ={92 constant double Gauss76Z[76] = { 93 93 -.999505948362153, //0 94 94 -.997397786355355, -
sasmodels/models/lib/polevl.c
r447e9aa r74e9b5f 51 51 */ 52 52 53 double polevl( double x, constant double *coef, int N ); 54 double polevl( double x, constant double *coef, int N )53 static 54 double polevl( double x, pconstant double *coef, int N ) 55 55 { 56 56 … … 72 72 */ 73 73 74 double p1evl( double x, constant double *coef, int N ); 75 double p1evl( double x, constant double *coef, int N )74 static 75 double p1evl( double x, pconstant double *coef, int N ) 76 76 { 77 77 int i=0; -
sasmodels/models/lib/sas_J1.c
r5181ccc r74e9b5f 42 42 #if FLOAT_SIZE>4 43 43 //Cephes double pression function 44 double cephes_j1(double x);45 44 46 45 constant double RPJ1[8] = { … … 106 105 0.0 }; 107 106 107 static 108 108 double cephes_j1(double x) 109 109 { … … 155 155 #else 156 156 //Single precission version of cephes 157 float cephes_j1f(float x);158 159 157 constant float JPJ1[8] = { 160 158 -4.878788132172128E-009, … … 190 188 }; 191 189 190 static 192 191 float cephes_j1f(float xx) 193 192 { … … 240 239 241 240 //Finally J1c function that equals 2*J1(x)/x 242 double sas_2J1x_x(double x); 241 static 243 242 double sas_2J1x_x(double x) 244 243 { -
sasmodels/models/lib/core_shell.c
r925ad6e r71b751d 7 7 ********************************************************************/ 8 8 static 9 double core_shell_ kernel(double q,9 double core_shell_fq(double q, 10 10 double radius, 11 11 double thickness, 12 12 double core_sld, 13 13 double shell_sld, 14 double solvent_sld) { 14 double solvent_sld) 15 { 15 16 // Core first, then add in shell 16 17 const double core_qr = q * radius; … … 26 27 const double shell_volume = M_4PI_3 * cube(radius + thickness); 27 28 f += shell_volume * shell_bes * shell_contrast; 28 return f * f * 1.0e-4;29 return f; 29 30 } 31 32 // Deprecated function: use core_shell_fq instead. 33 static 34 double core_shell_kernel(double q, 35 double radius, 36 double thickness, 37 double core_sld, 38 double shell_sld, 39 double solvent_sld) 40 { 41 const double fq = core_shell_fq(q, radius, thickness, core_sld, shell_sld, solvent_sld); 42 return 1.0e-4 * fq*fq; 43 } -
sasmodels/models/lib/sphere_form.c
r925ad6e r01c8d9e 13 13 return 1.0e-4*square(contrast * fq); 14 14 } 15
Note: See TracChangeset
for help on using the changeset viewer.