Changeset 50e1e40 in sasmodels for sasmodels/models/triaxial_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/triaxial_ellipsoid.c
r9c461c7 r50e1e40 20 20 21 21 double sn, cn; 22 // double st, ct;23 //const double lower = 0.0;24 //const double upper = 1.0;22 // translate a point in [-1,1] to a point in [0, 1] 23 const double zm = 0.5; 24 const double zb = 0.5; 25 25 double outer = 0.0; 26 26 for (int i=0;i<76;i++) { … … 34 34 double inner = 0.0; 35 35 for (int j=0;j<76;j++) { 36 const double y = 0.5*(Gauss76Z[j] + 1.0);37 const double t = q*sqrt(acosx2 + bsinx2*(1.0-y *y) + c2*y*y);36 const double ysq = square(Gauss76Z[j]*zm + zb); 37 const double t = q*sqrt(acosx2 + bsinx2*(1.0-ysq) + c2*ysq); 38 38 const double fq = sph_j1c(t); 39 39 inner += Gauss76Wt[j] * fq * fq ; … … 41 41 outer += Gauss76Wt[i] * 0.5 * inner; 42 42 } 43 // const double fq2 = (upper-lower)/2*outer;44 const double fq 2 = 0.5*outer;43 // translate dx in [-1,1] to dx in [lower,upper] 44 const double fqsq = outer*zm; 45 45 const double s = (sld - solvent_sld) * form_volume(req_minor, req_major, rpolar); 46 return 1.0e-4 * fq2 * s * s;46 return 1.0e-4 * s * s * fqsq; 47 47 } 48 48 … … 62 62 double sphi, cphi; 63 63 double spsi, cpsi; 64 double st, ct;65 64 66 65 const double q = sqrt(qx*qx + qy*qy); … … 76 75 + req_major*req_major*cmu*cmu 77 76 + rpolar*rpolar*calpha*calpha); 78 SINCOS(t, st, ct); 79 const double fq = ( t==0.0 ? 1.0 : 3.0*(st-t*ct)/(t*t*t) ); 77 const double fq = sph_j1c(t); 80 78 const double s = (sld - solvent_sld) * form_volume(req_minor, req_major, rpolar); 81 79 82 return 1.0e-4 * fq * fq * s * s;80 return 1.0e-4 * square(s * fq); 83 81 } 84 82
Note: See TracChangeset
for help on using the changeset viewer.