Changeset c499331 in sasmodels

Timestamp:

Mar 25, 2016 5:45:02 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:

d19962c

Parents:

5ff1b03

Message:

progress on having compare.py recognize vector parameters

Files:

• example/polynomial.py (added)
• sasmodels/compare.py (modified) (4 diffs)
• sasmodels/core.py (modified) (3 diffs)
• sasmodels/modelinfo.py (modified) (1 diff)

sasmodels/compare.py

@@ -307 +307 @@
     """
     lines = []
-    for p in model_info['parameters'].type['2d' if is2d else '1d']:
-        fields = dict(
-            value=pars.get(p.name, p.default),
-            pd=pars.get(p.name+"_pd", 0.),
-            n=int(pars.get(p.name+"_pd_n", 0)),
-            nsigma=pars.get(p.name+"_pd_nsgima", 3.),
-            type=pars.get(p.name+"_pd_type", 'gaussian'))
-        lines.append(_format_par(p.name, **fields))
+    parameters = model_info['parameters']
+    for p in parameters.type['2d' if is2d else '1d']:
+        if p.length > 1:
+            for k in range(p.length):
+                ext = "[%d]"%k
+                fields = dict(
+                    value=pars.get(p.id+ext, p.default),
+                    pd=pars.get(p.id+"_pd"+ext, 0.),
+                    n=int(pars.get(p.id+"_pd_n"+ext, 0)),
+                    nsigma=pars.get(p.id+"_pd_nsgima"+ext, 3.),
+                    type=pars.get(p.id+"_pd_type"+ext, 'gaussian'))
+                lines.append(_format_par(p.id+ext, **fields))
+        else:
+            fields = dict(
+                value=pars.get(p.id, p.default),
+                pd=pars.get(p.id+"_pd", 0.),
+                n=int(pars.get(p.id+"_pd_n", 0)),
+                nsigma=pars.get(p.id+"_pd_nsgima", 3.),
+                type=pars.get(p.id+"_pd_type", 'gaussian'))
+            lines.append(_format_par(p.name, **fields))
     return "\n".join(lines)
 
@@ -655 +667 @@
     """
     # Get the default values for the parameters
-    pars = dict((p.name, p.default) for p in model_info['parameters'])
-
-    # Fill in default values for the polydispersity parameters
+    pars = {}
     for p in model_info['parameters']:
-        if p.type in ('volume', 'orientation'):
-            pars[p.name+'_pd'] = 0.0
-            pars[p.name+'_pd_n'] = 0
-            pars[p.name+'_pd_nsigma'] = 3.0
-            pars[p.name+'_pd_type'] = "gaussian"
+        parts = [('', p.default)]
+        if p.polydisperse:
+            parts.append(('_pd', 0.0))
+            parts.append(('_pd_n', 0))
+            parts.append(('_pd_nsigma', 3.0))
+            parts.append(('_pd_type', "gaussian"))
+        for ext, val in parts:
+            if p.length > 1:
+                dict(("%s%s[%d]"%(p.id,ext,k), val) for k in range(p.length))
+            else:
+                pars[p.id+ext] = val
 
     # Plug in values given in demo
@@ -693 +709 @@
     name = args[0]
     try:
-        model_info = core.load_model_info(name)
+        if name.endswith('.py'):
+            model_info = core.load_model_info_from_path(name)
+        else:
+            model_info = core.load_model_info(name)
     except ImportError, exc:
         print(str(exc))
@@ -768 +787 @@
 
     if len(engines) == 0:
-        engines.extend(['single', 'sasview'])
+        engines.extend(['single', 'double'])
     elif len(engines) == 1:
-        if engines[0][0] != 'sasview':
-            engines.append('sasview')
+        if engines[0][0] != 'double':
+            engines.append('double')
         else:
             engines.append('single')

sasmodels/core.py

@@ -29 +29 @@
 ]
 
+try:
+    # Python 3.5 and up
+    from importlib.util import spec_from_file_location, module_from_spec
+    def load_module(fullname, path):
+        spec = spec_from_file_location(fullname, path)
+        module = module_from_spec(spec)
+        spec.loader.exec_module(module)
+        return module
+except ImportError:
+    # CRUFT: python 2
+    import imp
+    def load_module(fullname, path):
+        module = imp.load_source(fullname, path)
+        return module
+
 def list_models():
     """
@@ -50 +65 @@
     Load model info and build model.
     """
-    return build_model(load_model_info(model_name), **kw)
+    if model_name.endswith('.py'):
+        model_info = load_model_info_from_path(model_name)
+    else:
+        model_info = load_model_info(model_name)
+    return build_model(model_info, **kw)
 
 def load_model_info_from_path(path):
@@ -63 +82 @@
     # though it doesn't actually exist.  imp.load_source doesn't seem
     # to care.
-    kernel_module = imp.load_source('sasmodels.custom.'+name, path)
+    import sasmodels.custom
+    kernel_module = load_module('sasmodels.custom.'+name, path)
 
     # Now that we have the module, we can load it as usual

sasmodels/modelinfo.py

@@ -236 +236 @@
                 if int(low) != low or int(high) != high or low<0 or high>20:
                     raise ValueError("expected limits on %s to be within [0, 20]"%ref.name)
-                p.length = low
+                p.length = high
 
     def _set_defaults(self):