Changeset ab55943 in sasmodels

Timestamp:

Feb 19, 2015 6:09:06 PM (10 years ago)

Author:

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:

143e2f7

Parents:

68d3c1b

Message:

fix model search in compare_many

File:

• compare_many.py (modified) (3 diffs)

compare_many.py

@@ -7 +7 @@
 from sasmodels.kernelcl import environment
 from compare import (MODELS, randomize_model, suppress_pd, eval_sasview,
-                     eval_opencl, eval_ctypes, make_data)
+                     eval_opencl, eval_ctypes, make_data, get_demo_pars)
 
 def get_stats(target, value, index):
@@ -31 +31 @@
     print(','.join('"%s"'%c for c in columns))
 
-def compare_instance(model, data, index, N=1, mono=True, cutoff=1e-5):
-    name, pars = MODELS[model]()
+def compare_instance(name, data, index, N=1, mono=True, cutoff=1e-5):
+    pars = get_demo_pars(name)
     header = '\n"Model","%s","Count","%d"'%(name, N)
     if not mono: header += ',"Cutoff",%g'%(cutoff,)
@@ -102 +102 @@
 
     data, index = make_data(qmax=1.0, is2D=is2D, Nq=Nq)
-    model_list = [model] if model != "all" else list(sorted(MODELS.keys()))
+    model_list = [model] if model != "all" else MODELS
     for model in model_list:
         compare_instance(model, data, index, N=count, mono=mono, cutoff=cutoff)