Changes in sasmodels/compare.py [72a081d:af92b73] in sasmodels

File:

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

sasmodels/compare.py

@@ -369 +369 @@
             model = MultiplicationModel(P, S)
         else:
-            raise ValueError("sasview mixture models not supported by compare")
+            raise ValueError("mixture models not handled yet")
     else:
         model = get_model(model_info['oldname'])
@@ -424 +424 @@
     Return a model calculator using the OpenCL calculation engine.
     """
-    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")
+    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)
     calculator = DirectModel(data, model, cutoff=cutoff)
     calculator.engine = "OCL%s"%DTYPE_MAP[dtype]
@@ -440 +450 @@
     if dtype == 'quad':
         dtype = 'longdouble'
-    model = core.build_model(model_info, dtype=dtype, platform="dll")
+    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)
     calculator = DirectModel(data, model, cutoff=cutoff)
     calculator.engine = "OMP%s"%DTYPE_MAP[dtype]
@@ -694 +715 @@
         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]
-    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)
+    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)
 
     invalid = [o[1:] for o in flags
@@ -720 +749 @@
         'res'       : 0.0,
         'accuracy'  : 'Low',
-        'cutoff'    : 0.0,
+        'cutoff'    : 1e-5,
         'seed'      : -1,  # default to preset
         'mono'      : False,