Changeset c3ccaec in sasmodels for sasmodels/models/spherical_sld.c
- Timestamp:
- Feb 7, 2017 12:10:50 PM (7 years ago)
- Branches:
- master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
- Children:
- a90aa1c
- Parents:
- aa107ef (diff), fe8ff99 (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@…> (02/07/17 12:10:50)
- git-committer:
- GitHub <noreply@…> (02/07/17 12:10:50)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/models/spherical_sld.c
re83f2a0 rc3ccaec 35 35 const double qr = q * r; 36 36 const double qrsq = qr * qr; 37 const double bes = s ph_j1c(qr);37 const double bes = sas_3j1x_x(qr); 38 38 double sinqr, cosqr; 39 39 SINCOS(qr, sinqr, cosqr); … … 63 63 64 64 // uniform shell; r=0 => r^3=0 => f=0, so works for core as well. 65 f -= M_4PI_3 * cube(r) * sld_l * s ph_j1c(q*r);65 f -= M_4PI_3 * cube(r) * sld_l * sas_3j1x_x(q*r); 66 66 r += thickness[shell]; 67 f += M_4PI_3 * cube(r) * sld_l * s ph_j1c(q*r);67 f += M_4PI_3 * cube(r) * sld_l * sas_3j1x_x(q*r); 68 68 69 69 // iterate over sub_shells in the interface … … 95 95 } 96 96 // add in solvent effect 97 f -= M_4PI_3 * cube(r) * sld_solvent * s ph_j1c(q*r);97 f -= M_4PI_3 * cube(r) * sld_solvent * sas_3j1x_x(q*r); 98 98 99 99 const double f2 = f * f * 1.0e-4;
Note: See TracChangeset
for help on using the changeset viewer.