Changes in sasmodels/core.py [b0de252:d92182f] in sasmodels

File:

• sasmodels/core.py (modified) (6 diffs)

sasmodels/core.py

@@ -64 +64 @@
         * all: all models
         * py: python models only
-        * c: compiled models only
-        * single: models which support single precision
-        * double: models which require double precision
-        * opencl: controls if OpenCL is supperessed
-        * 1d: models which are 1D only, or 2D using abs(q)
-        * 2d: models which can be 2D
-        * magnetic: models with an sld
-        * nommagnetic: models without an sld
+        * c: c models only
+        * single: c models which support single precision
+        * double: c models which require double precision
+        * opencl: c models which run in opencl
+        * dll: c models which do not run in opencl
+        * 1d: models without orientation
+        * 2d: models with orientation
+        * magnetic: models supporting magnetic sld
+        * nommagnetic: models without magnetic parameter
 
     For multiple conditions, combine with plus.  For example, *c+single+2d*
@@ -95 +96 @@
     info = load_model_info(name)
     pars = info.parameters.kernel_parameters
-    if kind == "py" and callable(info.Iq):
-        return True
-    elif kind == "c" and not callable(info.Iq):
-        return True
-    elif kind == "double" and not info.single:
-        return True
-    elif kind == "single" and info.single:
-        return True
-    elif kind == "opencl" and info.opencl:
-        return True
-    elif kind == "2d" and any(p.type == 'orientation' for p in pars):
-        return True
-    elif kind == "1d" and all(p.type != 'orientation' for p in pars):
-        return True
-    elif kind == "magnetic" and any(p.type == 'sld' for p in pars):
-        return True
-    elif kind == "nonmagnetic" and any(p.type != 'sld' for p in pars):
-        return True
+    # TODO: may be adding Fq to the list at some point
+    is_pure_py = callable(info.Iq)
+    if kind == "py":
+        return is_pure_py
+    elif kind == "c":
+        return not is_pure_py
+    elif kind == "double":
+        return not info.single and not is_pure_py
+    elif kind == "single":
+        return info.single and not is_pure_py
+    elif kind == "opencl":
+        return info.opencl
+    elif kind == "dll":
+        return not info.opencl and not is_pure_py
+    elif kind == "2d":
+        return any(p.type == 'orientation' for p in pars)
+    elif kind == "1d":
+        return all(p.type != 'orientation' for p in pars)
+    elif kind == "magnetic":
+        return any(p.type == 'sld' for p in pars)
+    elif kind == "nonmagnetic":
+        return not any(p.type == 'sld' for p in pars)
     return False
 
@@ -206 +211 @@
 
     numpy_dtype, fast, platform = parse_dtype(model_info, dtype, platform)
-
     source = generate.make_source(model_info)
     if platform == "dll":
@@ -271 +275 @@
     # Assign default platform, overriding ocl with dll if OpenCL is unavailable
     # If opencl=False OpenCL is switched off
-
     if platform is None:
         platform = "ocl"
@@ -318 +321 @@
 
     return numpy_dtype, fast, platform
-
-def list_models_main():
-    # type: () -> None
-    """
-    Run list_models as a main program.  See :func:`list_models` for the
-    kinds of models that can be requested on the command line.
-    """
-    import sys
-    kind = sys.argv[1] if len(sys.argv) > 1 else "all"
-    print("\n".join(list_models(kind)))
 
 def test_composite_order():
@@ -382 +375 @@
     model = load_model("cylinder@hardsphere*sphere")
     actual = [p.name for p in model.info.parameters.kernel_parameters]
-    target = ("sld sld_solvent radius length theta phi volfraction"
+    target = ("sld sld_solvent radius length theta phi"
+              " radius_effective volfraction "
+              " structure_factor_mode radius_effective_mode"
               " A_sld A_sld_solvent A_radius").split()
     assert target == actual, "%s != %s"%(target, actual)
 
+def list_models_main():
+    # type: () -> None
+    """
+    Run list_models as a main program.  See :func:`list_models` for the
+    kinds of models that can be requested on the command line.
+    """
+    import sys
+    kind = sys.argv[1] if len(sys.argv) > 1 else "all"
+    try:
+        models = list_models(kind)
+    except Exception as exc:
+        print(list_models.__doc__)
+        return 1
+
+    print("\n".join(list_models(kind)))
+
 if __name__ == "__main__":
     list_models_main()