Changeset 9cfcac8 in sasmodels

Timestamp:

Jan 21, 2016 6:31:27 PM (9 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:

608e31e

Parents:

caeb06d

Message:

reduce lint

File:

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

sasmodels/compare.py

@@ -9 +9 @@
 trig, etc., and may not be completely IEEE 754 compliant.  This lets
 make sure that the model calculations are stable, or if you need to
-tag the model as double precision only.  
-
-Run using ./compare.sh (Linux, Mac) or compare.bat (Windows) in the 
+tag the model as double precision only.
+
+Run using ./compare.sh (Linux, Mac) or compare.bat (Windows) in the
 sasmodels root to see the command line options.
 
-Note that there is no way within sasmodels to select between an 
-OpenCL CPU device and a GPU device, but you can do so by setting the 
+Note that there is no way within sasmodels to select between an
+OpenCL CPU device and a GPU device, but you can do so by setting the
 PYOPENCL_CTX environment variable ahead of time.  Start a python
 interpreter and enter::
@@ -262 +262 @@
     # convert model parameters from sasmodel form to sasview form
     #print("old",sorted(pars.items()))
-    modelname, _pars = revert_model(model_definition, {})
+    modelname, _ = revert_model(model_definition, {})
     #print("new",sorted(_pars.items()))
     sas = __import__('sas.models.'+modelname)
@@ -331 +331 @@
 
 def eval_ctypes(model_definition, data, dtype='double', cutoff=0.):
+    """
+    Return a model calculator using the DLL calculation engine.
+    """
     if dtype == 'quad':
         dtype = 'longdouble'
@@ -404 +407 @@
     parameters.
     """
-    Nbase, Ncomp = opts['N1'], opts['N2']
+    Nbase, Ncomp = opts['n1'], opts['n2']
     pars = opts['pars']
     data = opts['data']
@@ -550 +553 @@
     info = generate.make_info(model_definition)
     # Get the default values for the parameters
-    pars = dict((p[0],p[2]) for p in info['parameters'])
+    pars = dict((p[0], p[2]) for p in info['parameters'])
 
     # Fill in default values for the polydispersity parameters
@@ -584 +587 @@
         sys.exit(1)
     if len(args) > 3:
-        print("expected parameters: model Nopencl Nsasview")
+        print("expected parameters: model N1 N2")
 
     invalid = [o[1:] for o in flags
@@ -650 +653 @@
 
     if len(engines) == 0:
-        engines.extend(['single','sasview'])
+        engines.extend(['single', 'sasview'])
     elif len(engines) == 1:
         if engines[0][0] != 'sasview':
@@ -662 +665 @@
     model_definition = core.load_model_definition(name)
 
-    N1 = int(args[1]) if len(args) > 1 else 1
-    N2 = int(args[2]) if len(args) > 2 else 1
+    n1 = int(args[1]) if len(args) > 1 else 1
+    n2 = int(args[2]) if len(args) > 2 else 1
 
     # Get demo parameters from model definition, or use default parameters
@@ -695 +698 @@
     # Create the computational engines
     data, _index = make_data(opts)
-    if N1:
+    if n1:
         base = make_engine(model_definition, data, engines[0], opts['cutoff'])
     else:
         base = None
-    if N2:
+    if n2:
         comp = make_engine(model_definition, data, engines[1], opts['cutoff'])
     else:
@@ -708 +711 @@
         'name'      : name,
         'def'       : model_definition,
-        'N1'        : N1,
-        'N2'        : N2,
+        'n1'        : n1,
+        'n2'        : n2,
         'presets'   : presets,
         'pars'      : pars,