Changeset c3ccaec in sasmodels for sasmodels/models/onion.c


Ignore:
Timestamp:
Feb 7, 2017 2:10:50 PM (7 years ago)
Author:
GitHub <noreply@…>
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 14:10:50)
git-committer:
GitHub <noreply@…> (02/07/17 14:10:50)
Message:

Merge branch 'master' into ticket-815

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/onion.c

    r768c0c4 rc3ccaec  
    66  const double vol = M_4PI_3 * cube(r); 
    77  const double qr = q * r; 
    8   const double bes = sph_j1c(qr); 
     8  const double bes = sas_3j1x_x(qr); 
    99  const double alpha = A * r/thickness; 
    1010  double result; 
Note: See TracChangeset for help on using the changeset viewer.