Changeset daeef4c in sasmodels for sasmodels/models/stacked_disks.c
- Timestamp:
- Jan 17, 2017 1:42:48 AM (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:
- 54f1d96, 3a45c2c
- Parents:
- 7c2935c (diff), 6c3e266 (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:
- celinedurniak <celinedurniak@…> (01/17/17 01:42:48)
- git-committer:
- GitHub <noreply@…> (01/17/17 01:42:48)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/models/stacked_disks.c
r98ce141 r6c3e266 53 53 const double sinarg2 = q*(halfheight+thick_layer)*cos_alpha; 54 54 55 const double be1 = sas_ J1c(besarg1);56 //const double be2 = sas_ J1c(besarg2);55 const double be1 = sas_2J1x_x(besarg1); 56 //const double be2 = sas_2J1x_x(besarg2); 57 57 const double be2 = be1; 58 const double si1 = s inc(sinarg1);59 const double si2 = s inc(sinarg2);58 const double si1 = sas_sinx_x(sinarg1); 59 const double si2 = sas_sinx_x(sinarg2); 60 60 61 61 const double dr1 = core_sld - solvent_sld;
Note: See TracChangeset
for help on using the changeset viewer.