Changes in compare.py [87fce00:373d1b6] in sasmodels

File:

• compare.py (modified) (3 diffs)

compare.py

@@ -10 +10 @@
 
 from sasmodels.bumps_model import BumpsModel, plot_data, tic
-try: from sasmodels import kernelcl
-except: from sasmodels import kerneldll as kernelcl
-from sasmodels import kerneldll
+from sasmodels import kernelcl, kerneldll
 from sasmodels.convert import revert_model
 
@@ -301 +299 @@
     ]
 
+def get_demo_pars(name):
+    import sasmodels.models
+    __import__('sasmodels.models.'+name)
+    model = getattr(sasmodels.models, name)
+    pars = getattr(model, 'demo', None)
+    if pars is None: pars = dict((p[0],p[2]) for p in model.parameters)
+    return pars
+
 def main():
     opts = [arg for arg in sys.argv[1:] if arg.startswith('-')]
@@ -322 +328 @@
     # if model does not define demo parameters
     name = args[0]
-    import sasmodels.models
-    __import__('sasmodels.models.'+name)
-    model = getattr(sasmodels.models, name)
-    pars = getattr(model, 'demo', None)
-    if pars is None: pars = dict((p[0],p[2]) for p in model.parameters)
+    pars = get_demo_pars(name)
 
     Nopencl = int(args[1]) if len(args) > 1 else 5