Changeset fa1582e in sasmodels

Timestamp:

Mar 29, 2016 10:38:55 AM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

2a3e1f5, d7028dc

Parents:

53215cf

Message:

remove constraint which set n_stacking=1 on stacked disk model in compare

Location:

sasmodels

Files:

• compare.py (modified) (2 diffs)
• convert.py (modified) (1 diff)

sasmodels/compare.py

@@ -785 +785 @@
     n1 = int(args[1]) if len(args) > 1 else 1
     n2 = int(args[2]) if len(args) > 2 else 1
+    use_sasview = any(engine=='sasview' and count>0
+                      for engine, count in zip(engines, [n1, n2]))
 
     # Get demo parameters from model definition, or use default parameters
@@ -812 +814 @@
     #import pprint; pprint.pprint(model_info)
     constrain_pars(model_info, pars)
-    constrain_new_to_old(model_info, pars)
+    if use_sasview:
+        constrain_new_to_old(model_info, pars)
     if opts['show_pars']:
         print(str(parlist(model_info, pars, opts['is2d'])))

sasmodels/convert.py

@@ -183 +183 @@
     namelist = name.split('*') if '*' in name else [name]
     for name in namelist:
-        if name == 'stacked_disks':
-            pars['n_stacking'] = 1
-        elif name == 'pearl_necklace':
+        #if name == 'stacked_disks':
+        #    pars['n_stacking'] = 1
+        if name == 'pearl_necklace':
             pars['string_thickness_pd_n'] = 0
             pars['number_of_pearls_pd_n'] = 0