Changeset 3e8ea5d in sasmodels

Timestamp:

Oct 18, 2016 10:31:22 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

6d96b66

Parents:

c3ebc71

Message:

constrain pearls to be bigger than string

File:

• sasmodels/compare.py (modified) (1 diff)

sasmodels/compare.py

@@ -334 +334 @@
         rg_max = np.sqrt(90*np.log(10) + 3*np.log(pars['scale']))/q_max
         pars['rg'] = min(pars['rg'], rg_max)
+
+    elif name == 'pearl_necklace':
+        if pars['radius'] < pars['thick_string']:
+            pars['radius'], pars['thick_string'] = pars['thick_string'], pars['radius']
+        pars['num_pearls'] = math.ceil(pars['num_pearls'])
+        pass
 
     elif name == 'rpa':