Changeset f3bd37f in sasmodels

Timestamp:

Jul 17, 2016 4:36:34 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:

46ed760

Parents:

b9c12fe5

Message:

fix compare_many

Location:

sasmodels

Files:

• compare.py (modified) (2 diffs)
• compare_many.py (modified) (6 diffs)

sasmodels/compare.py

@@ -257 +257 @@
     Randomize a single parameter.
     """
-    if any(p.endswith(s) for s in ('_pd_n', '_pd_nsigma', '_pd_type')):
+    if any(p.endswith(s) for s in ('_pd', '_pd_n', '_pd_nsigma', '_pd_type')):
         return v
 
@@ -405 +405 @@
             raise ValueError("sasview mixture models not supported by compare")
     else:
-        model = get_model(revert_name(model_info))
+        old_name = revert_name(model_info)
+        if old_name is None:
+            raise ValueError("model %r does not exist in old sasview"
+                            % model_info.id)
+        model = get_model(old_name)
 
     # build a smearer with which to call the model, if necessary

sasmodels/compare_many.py

@@ -20 +20 @@
 
 from . import core
-from .compare import (MODELS, randomize_pars, suppress_pd, make_data,
+from .compare import (randomize_pars, suppress_pd, make_data,
                       make_engine, get_pars, columnize,
                       constrain_pars, constrain_new_to_old)
+
+MODELS = core.list_models()
 
 def calc_stats(target, value, index):
@@ -108 +110 @@
 
     if is_2d:
-        if not model_info['parameters'].has_2d:
+        if not model_info.parameters.has_2d:
             print(',"1-D only"')
             return
@@ -145 +147 @@
 
 
-    calc_base = make_engine(model_info, data, base, cutoff)
-    calc_comp = make_engine(model_info, data, comp, cutoff)
+    try:
+        calc_base = make_engine(model_info, data, base, cutoff)
+        calc_comp = make_engine(model_info, data, comp, cutoff)
+    except Exception as exc:
+        #raise
+        print('"Error: %s"'%str(exc).replace('"',"'"))
+        print('"good","%d of %d","max diff",%g'%(0, N, np.NaN))
+        return
     expected = max(PRECISION[base], PRECISION[comp])
 
@@ -155 +163 @@
         print("%s %d"%(name, k), file=sys.stderr)
         seed = np.random.randint(1e6)
-        pars_i = randomize_pars(pars, seed)
+        pars_i = randomize_pars(model_info, pars, seed)
         constrain_pars(model_info, pars_i)
         constrain_new_to_old(model_info, pars_i)
@@ -172 +180 @@
         else:
             print(("%d,"%seed)+','.join("%s"%v for v in columns))
-    print('"good","%d/%d","max diff",%g'%(num_good, N, max_diff[0]))
+    print('"good","%d of %d","max diff",%g'%(num_good, N, max_diff[0]))
 
 
@@ -249 +257 @@
 
     data, index = make_data({'qmax':1.0, 'is2d':is2D, 'nq':Nq, 'res':0.,
-                             'accuracy': 'Low', 'view':'log'})
+                             'accuracy': 'Low', 'view':'log', 'zero': False})
     model_list = [model] if model != "all" else MODELS
     for model in model_list: