Changeset 17bbadd in sasmodels for sasmodels/compare_many.py

Timestamp:

Mar 15, 2016 12:47:12 PM (8 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:

754e27b

Parents:

5ceb7d0

Message:

refactor so all model defintion queries use model_info; better documentation of model_info structure; initial implementation of product model (broken)

File:

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

sasmodels/compare_many.py

@@ -101 +101 @@
 
     is_2d = hasattr(data, 'qx_data')
-    model_definition = core.load_model_definition(name)
-    pars = get_demo_pars(model_definition)
+    model_info = core.load_model_info(name)
+    pars = get_demo_pars(model_info)
     header = ('\n"Model","%s","Count","%d","Dimension","%s"'
               % (name, N, "2D" if is_2d else "1D"))
@@ -109 +109 @@
 
     if is_2d:
-        info = generate.make_info(model_definition)
-        partype = info['partype']
+        partype = model_info['partype']
         if not partype['orientation'] and not partype['magnetic']:
             print(',"1-D only"')
@@ -150 +149 @@
 
 
-    calc_base = make_engine(model_definition, data, base, cutoff)
-    calc_comp = make_engine(model_definition, data, comp, cutoff)
+    calc_base = make_engine(model_info, data, base, cutoff)
+    calc_comp = make_engine(model_info, data, comp, cutoff)
     expected = max(PRECISION[base], PRECISION[comp])
 
@@ -161 +160 @@
         seed = np.random.randint(1e6)
         pars_i = randomize_pars(pars, seed)
-        constrain_pars(model_definition, pars_i)
-        constrain_new_to_old(model_definition, pars_i)
+        constrain_pars(model_info['id'], pars_i)
+        constrain_new_to_old(model_info['id'], pars_i)
         if mono:
             pars_i = suppress_pd(pars_i)