Changeset 72a081d in sasmodels for sasmodels/compare.py

Timestamp:

Mar 19, 2016 6:52:46 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:

f3d7abd

Parents:

ce43de0

Message:

refactor product/mixture; add load model from path; default compare to -cutoff=0

File:

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

sasmodels/compare.py

@@ -369 +369 @@
             model = MultiplicationModel(P, S)
         else:
-            raise ValueError("mixture models not handled yet")
+            raise ValueError("sasview mixture models not supported by compare")
     else:
         model = get_model(model_info['oldname'])
@@ -424 +424 @@
     Return a model calculator using the OpenCL calculation engine.
     """
-    def builder(model_info):
-        try:
-            return core.build_model(model_info, dtype=dtype, platform="ocl")
-        except Exception as exc:
-            print(exc)
-            print("... trying again with single precision")
-            return core.build_model(model_info, dtype='single', platform="ocl")
-    if model_info['composition']:
-        composition_type, parts = model_info['composition']
-        if composition_type == 'product':
-            P, S = [builder(p) for p in parts]
-            model = product.ProductModel(P, S)
-        else:
-            raise ValueError("mixture models not handled yet")
-    else:
-        model = builder(model_info)
+    try:
+        model = core.build_model(model_info, dtype=dtype, platform="ocl")
+    except Exception as exc:
+        print(exc)
+        print("... trying again with single precision")
+        model = core.build_model(model_info, dtype='single', platform="ocl")
     calculator = DirectModel(data, model, cutoff=cutoff)
     calculator.engine = "OCL%s"%DTYPE_MAP[dtype]
@@ -450 +440 @@
     if dtype == 'quad':
         dtype = 'longdouble'
-    def builder(model_info):
-        return core.build_model(model_info, dtype=dtype, platform="dll")
-
-    if model_info['composition']:
-        composition_type, parts = model_info['composition']
-        if composition_type == 'product':
-            P, S = [builder(p) for p in parts]
-            model = product.ProductModel(P, S)
-        else:
-            raise ValueError("mixture models not handled yet")
-    else:
-        model = builder(model_info)
+    model = core.build_model(model_info, dtype=dtype, platform="dll")
     calculator = DirectModel(data, model, cutoff=cutoff)
     calculator.engine = "OMP%s"%DTYPE_MAP[dtype]
@@ -715 +694 @@
         print("expected parameters: model N1 N2")
 
-    def _get_info(name):
-        try:
-            model_info = core.load_model_info(name)
-        except ImportError, exc:
-            print(str(exc))
-            print("Use one of:\n    " + models)
-            sys.exit(1)
-        return model_info
-
     name = args[0]
-    if '*' in name:
-        parts = [_get_info(k) for k in name.split('*')]
-        model_info = product.make_product_info(*parts)
-    else:
-        model_info = _get_info(name)
+    try:
+        model_info = core.load_model_info(name)
+    except ImportError, exc:
+        print(str(exc))
+        print("Could not find model; use one of:\n    " + models)
+        sys.exit(1)
 
     invalid = [o[1:] for o in flags
@@ -749 +720 @@
         'res'       : 0.0,
         'accuracy'  : 'Low',
-        'cutoff'    : 1e-5,
+        'cutoff'    : 0.0,
         'seed'      : -1,  # default to preset
         'mono'      : False,