Changeset bb2d187 in sasmodels

Timestamp:

Oct 4, 2016 6:04:38 PM (8 years ago)

Author:

wojciech

Branches:

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

Children:

b0c4271

Parents:

e6378f9

Message:

Changing radius parameters names for barbell and capped cylinder model in compare.py

File:

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

sasmodels/compare.py

@@ -312 +312 @@
         name = name.split('*')[0]
 
-    if name == 'capped_cylinder' and pars['cap_radius'] < pars['radius']:
-        pars['radius'], pars['cap_radius'] = pars['cap_radius'], pars['radius']
-    if name == 'barbell' and pars['bell_radius'] < pars['radius']:
-        pars['radius'], pars['bell_radius'] = pars['bell_radius'], pars['radius']
+    if name == 'capped_cylinder' and pars['radius_cap'] < pars['radius']:
+        pars['radius'], pars['radius_cap'] = pars['radius_cap'], pars['radius']
+    if name == 'barbell' and pars['radius_bell'] < pars['radius']:
+        pars['radius'], pars['radius_bell'] = pars['radius_bell'], pars['radius']
 
     # Limit guinier to an Rg such that Iq > 1e-30 (single precision cutoff)