Changeset b8e5e21 in sasmodels

Timestamp:

Mar 16, 2016 6:22:29 AM (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:

28da77d

Parents:

667a6f2

Message:

had structure_factor, has_2d and variants to info

Location:

sasmodels

Files:

• compare_many.py (modified) (1 diff)
• core.py (modified) (3 diffs)
• generate.py (modified) (6 diffs)

sasmodels/compare_many.py

@@ -109 +109 @@
 
     if is_2d:
-        partype = model_info['partype']
-        if not partype['orientation'] and not partype['magnetic']:
+        if not model_info['has_2d']:
             print(',"1-D only"')
             return

sasmodels/core.py

@@ -34 +34 @@
     return available_models
 
+def isstr(s):
+    """
+    Return True if *s* is a string-like object.
+    """
+    try: s + ''
+    except: return False
+    return True
+
+def load_model(model_name, **kw):
+    """
+    Load model info and build model.
+    """
+    return build_model(load_model_info(model_name), **kw)
 
 def load_model_info(model_name):
@@ -46 +59 @@
     return generate.make_model_info(kernel_module)
 
-
-def precompile_dll(model_name, dtype="double"):
-    """
-    Precompile the dll for a model.
-
-    Returns the path to the compiled model, or None if the model is a pure
-    python model.
-
-    This can be used when build the windows distribution of sasmodels
-    (which may be missing the OpenCL driver and the dll compiler), or
-    otherwise sharing models with windows users who do not have a compiler.
-
-    See :func:`sasmodels.kerneldll.make_dll` for details on controlling the
-    dll path and the allowed floating point precision.
-    """
-    model_info = load_model_info(model_name)
-    source = generate.make_source(model_info)
-    return kerneldll.make_dll(source, model_info, dtype=dtype) if source else None
-
-
-def isstr(s):
-    """
-    Return True if *s* is a string-like object.
-    """
-    try: s + ''
-    except: return False
-    return True
 
 def build_model(model_info, dtype=None, platform="ocl"):
@@ -114 +100 @@
     else:
         return kernelcl.GpuModel(source, model_info, dtype)
+
+def precompile_dll(model_name, dtype="double"):
+    """
+    Precompile the dll for a model.
+
+    Returns the path to the compiled model, or None if the model is a pure
+    python model.
+
+    This can be used when build the windows distribution of sasmodels
+    (which may be missing the OpenCL driver and the dll compiler), or
+    otherwise sharing models with windows users who do not have a compiler.
+
+    See :func:`sasmodels.kerneldll.make_dll` for details on controlling the
+    dll path and the allowed floating point precision.
+    """
+    model_info = load_model_info(model_name)
+    source = generate.make_source(model_info)
+    return kerneldll.make_dll(source, model_info, dtype=dtype) if source else None
+
 
 def make_kernel(model, q_vectors):

sasmodels/generate.py

@@ -235 +235 @@
 COMMON_PARAMETERS = [
     ["scale", "", 1, [0, np.inf], "", "Source intensity"],
-    ["background", "1/cm", 0, [0, np.inf], "", "Source background"],
+    ["background", "1/cm", 1e-3, [0, np.inf], "", "Source background"],
     ]
 
@@ -629 +629 @@
     """
     # Fill in the derived attributes
+    partype = categorize_parameters(model_info['parameters'])
     model_info['limits'] = dict((p[0], p[3]) for p in model_info['parameters'])
-    model_info['partype'] = categorize_parameters(model_info['parameters'])
+    model_info['partype'] = partype
     model_info['defaults'] = dict((p[0], p[2]) for p in model_info['parameters'])
     if model_info.get('demo', None) is None:
         model_info['demo'] = model_info['defaults']
+    model_info['has_2d'] = partype['orientation'] or partype['magnetic']
 
 def make_model_info(kernel_module):
@@ -655 +657 @@
     * *parameters* is the model parameter table
     * *single* is True if the model allows single precision
+    * *structure_factor* is True if the model is useable in a product
+    * *variant_info* contains the information required to select between
+      model variants (e.g., the list of cases) or is None if there are no
+      model variants
     * *defaults* is the *{parameter: value}* table built from the parameter
       description table.
@@ -678 +684 @@
     """
     # TODO: maybe turn model_info into a class ModelDefinition
-    #print(kernelfile)
-    category = getattr(kernel_module, 'category', None)
     parameters = COMMON_PARAMETERS + kernel_module.parameters
-    # Default the demo parameters to the starting values for the individual
-    # parameters if an explicit demo parameter set has not been specified.
-    demo_parameters = getattr(kernel_module, 'demo', None)
     filename = abspath(kernel_module.__file__)
     kernel_id = splitext(basename(filename))[0]
     name = getattr(kernel_module, 'name', None)
-    single = getattr(kernel_module, 'single', True)
     if name is None:
         name = " ".join(w.capitalize() for w in kernel_id.split('_'))
@@ -696 +696 @@
         title=kernel_module.title,
         description=kernel_module.description,
-        docs=kernel_module.__doc__,
-        category=category,
         parameters=parameters,
         composition=None,
-        single=single,
-        demo=demo_parameters,
+        docs=kernel_module.__doc__,
+        category=getattr(kernel_module, 'category', None),
+        single=getattr(kernel_module, 'single', True),
+        structure_factor=getattr(kernel_module, 'structure_factor', False),
+        variant_info=getattr(kernel_module, 'invariant_info', None),
+        demo=getattr(kernel_module, 'demo', None),
         source=getattr(kernel_module, 'source', []),
         oldname=getattr(kernel_module, 'oldname', None),
@@ -708 +710 @@
         )
     process_parameters(model_info)
-    # Fill in attributes which default to None
+    # Fill in available functions
     model_info.update((k, getattr(kernel_module, k, None))
                       for k in ('ER', 'VR', 'form_volume', 'Iq', 'Iqxy'))