- Timestamp:
- Nov 6, 2017 2:29:25 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:
- c11d09f, 1e867a4
- Parents:
- c15e03c (diff), 82592da (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. - Location:
- sasmodels/models
- Files:
-
- 1 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/models/core_shell_bicelle_elliptical.c
rbecded3 r82592da 92 92 93 93 // Compute effective radius in rotated coordinates 94 const double qr_hat = sqrt(square(r_major*q a) + square(r_minor*qb));95 const double qrshell_hat = sqrt(square((r_major+thick_rim)*q a)96 + square((r_minor+thick_rim)*q b));94 const double qr_hat = sqrt(square(r_major*qb) + square(r_minor*qa)); 95 const double qrshell_hat = sqrt(square((r_major+thick_rim)*qb) 96 + square((r_minor+thick_rim)*qa)); 97 97 const double be1 = sas_2J1x_x( qr_hat ); 98 98 const double be2 = sas_2J1x_x( qrshell_hat ); -
sasmodels/models/core_shell_bicelle_elliptical_belt_rough.c
r129bdc4 r82592da 91 91 double sigma) 92 92 { 93 // THIS NEEDS TESTING93 // integrated 2d seems to match 1d reasonably well, except perhaps at very high Q 94 94 // Vol1,2,3 and dr1,2,3 are now for Vcore, Vcore+rim, Vcore+face, 95 95 const double dr1 = -rhor - rhoh + rhoc + rhosolv; … … 103 103 104 104 // Compute effective radius in rotated coordinates 105 const double qr_hat = sqrt(square(r_major*q a) + square(r_minor*qb));105 const double qr_hat = sqrt(square(r_major*qb) + square(r_minor*qa)); 106 106 // does this need to be changed for the "missing corners" where there there is no "belt" ? 107 const double qrshell_hat = sqrt(square((r_major+thick_rim)*q a)108 + square((r_minor+thick_rim)*q b));107 const double qrshell_hat = sqrt(square((r_major+thick_rim)*qb) 108 + square((r_minor+thick_rim)*qa)); 109 109 const double be1 = sas_2J1x_x( qr_hat ); 110 110 const double be2 = sas_2J1x_x( qrshell_hat ); -
sasmodels/models/elliptical_cylinder.c
rbecded3 r82592da 28 28 //const double arg = radius_minor*sin_val; 29 29 double inner_sum=0; 30 for(int j=0;j< 20;j++) {31 //20 gauss points for the inner integral 32 const double theta = ( Gauss 20Z[j]*(vbj-vaj) + vaj + vbj )/2.0;30 for(int j=0;j<76;j++) { 31 //20 gauss points for the inner integral, increase to 76, RKH 6Nov2017 32 const double theta = ( Gauss76Z[j]*(vbj-vaj) + vaj + vbj )/2.0; 33 33 const double r = sin_val*sqrt(rA - rB*cos(theta)); 34 34 const double be = sas_2J1x_x(q*r); 35 inner_sum += Gauss 20Wt[j] * be * be;35 inner_sum += Gauss76Wt[j] * be * be; 36 36 } 37 37 //now calculate the value of the inner integral … … 61 61 // Compute: r = sqrt((radius_major*cos_nu)^2 + (radius_minor*cos_mu)^2) 62 62 // Given: radius_major = r_ratio * radius_minor 63 const double qr = radius_minor*sqrt(square(r_ratio*q a) + square(qb));63 const double qr = radius_minor*sqrt(square(r_ratio*qb) + square(qa)); 64 64 const double be = sas_2J1x_x(qr); 65 65 const double si = sas_sinx_x(qc*0.5*length);
Note: See TracChangeset
for help on using the changeset viewer.