Changes in sasmodels/compare.py [cd3dba0:73a3e22] in sasmodels

File:

• sasmodels/compare.py (modified) (10 diffs)

sasmodels/compare.py

@@ -16 +16 @@
 from . import core
 from . import kerneldll
-from . import generate
+from . import models
 from .data import plot_theory, empty_data1D, empty_data2D
 from .direct_model import DirectModel
@@ -116 +116 @@
         return 2*np.random.rand()*(v if v != 0 else 1)
 
-def randomize_model(pars, seed=None):
+def randomize_model(name, pars, seed=None):
     if seed is None:
         seed = np.random.randint(1e9)
@@ -122 +122 @@
     # Note: the sort guarantees order of calls to random number generator
     pars = dict((p,randomize(p,v)) for p,v in sorted(pars.items()))
-
-    return pars, seed
-
-def constrain_pars(model_definition, pars):
-    name = model_definition.name
+    # The capped cylinder model has a constraint on its parameters
     if name == 'capped_cylinder' and pars['cap_radius'] < pars['radius']:
         pars['radius'],pars['cap_radius'] = pars['cap_radius'],pars['radius']
-
-    # These constraints are only needed for comparison to sasview
-    if name in ('teubner_strey','broad_peak'):
-        del pars['scale']
-    if name in ('guinier',):
-        del pars['background']
-    if getattr(model_definition, 'category', None) == 'structure-factor':
-        del pars['scale'], pars['background']
-
+    return pars, seed
 
 def parlist(pars):
@@ -221 +209 @@
 
 def compare(name, pars, Ncpu, Nocl, opts, set_pars):
-    model_definition = core.load_model_definition(name)
-
     view = 'linear' if '-linear' in opts else 'log' if '-log' in opts else 'q4' if '-q4' in opts else 'log'
 
@@ -245 +231 @@
     if '-random' in opts or '-random' in opt_values:
         seed = int(opt_values['-random']) if '-random' in opt_values else None
-        pars, seed = randomize_model(pars, seed=seed)
-        constrain_pars(model_definition, pars)
+        pars, seed = randomize_model(name, pars, seed=seed)
         print "Randomize using -random=%i"%seed
     pars.update(set_pars)  # set value after random to control value
@@ -256 +241 @@
         print "pars",parlist(pars)
 
+    model_definition = core.load_model_definition(name)
     # OpenCl calculation
     if Nocl > 0:
@@ -261 +247 @@
                                     dtype=dtype, cutoff=cutoff, Nevals=Nocl)
         print "opencl t=%.1f ms, intensity=%.0f"%(ocl_time, sum(ocl))
-        #print "ocl", ocl
         #print max(ocl), min(ocl)
 
@@ -276 +261 @@
             #print "ocl/sasview", (ocl-pars['background'])/(cpu-pars['background'])
             print "sasview t=%.1f ms, intensity=%.0f"%(cpu_time, sum(cpu))
-            #print "sasview",cpu
         except ImportError:
             Ncpu = 0
@@ -412 +396 @@
 
 
-def get_demo_pars(model_definition):
-    info = generate.make_info(model_definition)
-    pars = dict((p[0],p[2]) for p in info['parameters'])
-    pars.update(info['demo'])
+def get_demo_pars(name):
+    __import__('sasmodels.models.'+name)
+    model = getattr(models, name)
+    pars = getattr(model, 'demo', None)
+    if pars is None: pars = dict((p[0],p[2]) for p in model.parameters)
     return pars
 
@@ -440 +425 @@
     # if model does not define demo parameters
     name = args[0]
-    model_definition = core.load_model_definition(name)
-    pars = get_demo_pars(model_definition)
+    pars = get_demo_pars(name)
 
     Nopencl = int(args[1]) if len(args) > 1 else 5