Changeset 50e1e40 in sasmodels for sasmodels/models/ellipsoid.c
- Timestamp:
- Mar 1, 2016 5:49:00 PM (8 years ago)
- 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:
- ad90df9
- Parents:
- a4a7308
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/models/ellipsoid.c
r9c461c7 r50e1e40 17 17 double form_volume(double rpolar, double requatorial) 18 18 { 19 return 1.333333333333333*M_PI*rpolar*requatorial*requatorial;19 return M_4PI_3*rpolar*requatorial*requatorial; 20 20 } 21 21 … … 26 26 double requatorial) 27 27 { 28 //const double lower = 0.0; 29 //const double upper = 1.0; 28 // translate a point in [-1,1] to a point in [0, 1] 29 const double zm = 0.5; 30 const double zb = 0.5; 30 31 double total = 0.0; 31 32 for (int i=0;i<76;i++) { 32 33 //const double sin_alpha = (Gauss76Z[i]*(upper-lower) + upper + lower)/2; 33 const double sin_alpha = 0.5*(Gauss76Z[i] + 1.0);34 const double sin_alpha = Gauss76Z[i]*zm + zb; 34 35 total += Gauss76Wt[i] * _ellipsoid_kernel(q, rpolar, requatorial, sin_alpha); 35 36 } 36 // const double form = (upper-lower)/2*total;37 const double form = 0.5*total;37 // translate dx in [-1,1] to dx in [lower,upper] 38 const double form = total*zm; 38 39 const double s = (sld - solvent_sld) * form_volume(rpolar, requatorial); 39 return 1.0e-4 * form * s * s;40 return 1.0e-4 * s * s * form; 40 41 } 41 42
Note: See TracChangeset
for help on using the changeset viewer.