Changeset a8a1d48 in sasmodels for sasmodels/models

Timestamp:

Mar 5, 2019 12:35:27 PM (5 years ago)

Author:

GitHub <noreply@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

e589e9a

Parents:

e5bbe64 (diff), c1799d3 (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@…> (03/05/19 12:35:27)

git-committer:

GitHub <noreply@…> (03/05/19 12:35:27)

Message:

Set structure factor background default to 0.0. Closes #1157.

Location:

sasmodels/models

Files:

• hardsphere.py (modified) (1 diff)
• pearl_necklace.c (modified) (2 diffs)

sasmodels/models/hardsphere.py

@@ -162 +162 @@
     return pars
 
-demo = dict(radius_effective=200, volfraction=0.2,
-            radius_effective_pd=0.1, radius_effective_pd_n=40)
 # Q=0.001 is in the Taylor series, low Q part, so add Q=0.1,
 # assuming double precision sasview is correct

sasmodels/models/pearl_necklace.c

@@ -40 +40 @@
     const double si = sas_sinx_x(q*A_s);
     const double omsi = 1.0 - si;
-    const double pow_si = pow(si, num_pearls);
+    const double pow_si = pown(si, num_pearls);
 
     // form factor for num_pearls
@@ -81 +81 @@
 radius_from_volume(double radius, double edge_sep, double thick_string, double fp_num_pearls)
 {
-    const int num_pearls = (int) fp_num_pearls +0.5;
     const double vol_tot = form_volume(radius, edge_sep, thick_string, fp_num_pearls);
     return cbrt(vol_tot/M_4PI_3);