Changeset 32398dc in sasmodels for sasmodels/compare_many.py

Timestamp:

Nov 29, 2017 8:23:16 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

fa79f5c

Parents:

e65c3ba

Message:

remove sascomp support for sasview 3.x models

File:

• sasmodels/compare_many.py (modified) (3 diffs)

sasmodels/compare_many.py

@@ -22 +22 @@
 from .compare import (randomize_pars, suppress_pd, make_data,
                       make_engine, get_pars, columnize,
-                      constrain_pars, constrain_new_to_old)
+                      constrain_pars)
 
 MODELS = core.list_models()
@@ -80 +80 @@
     'double!': 5e-14,
     'quad!': 5e-18,
-    'sasview': 5e-14,
 }
 def compare_instance(name, data, index, N=1, mono=True, cutoff=1e-5,
-                     base='sasview', comp='double'):
+                     base='single', comp='double'):
     r"""
     Compare the model under different calculation engines.
@@ -164 +163 @@
         print("Model %s %d"%(name, k+1), file=sys.stderr)
         seed = np.random.randint(1e6)
-        pars_i = randomize_pars(model_info, pars, seed)
+        np.random.seed(seed)
+        pars_i = randomize_pars(model_info, pars)
         constrain_pars(model_info, pars_i)
-        if 'sasview' in (base, comp):
-            constrain_new_to_old(model_info, pars_i)
         if mono:
             pars_i = suppress_pd(pars_i)