Changeset 7673ecd in sasview for src/sas/sasgui/perspectives/calculator/pyconsole.py

Timestamp:

Jun 22, 2016 10:23:20 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d7573c7

Parents:

ad52d31

Message:

refactor support for sum model; put tracebacks in logging errors

File:

• src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) (2 diffs)

src/sas/sasgui/perspectives/calculator/pyconsole.py

@@ -27 +27 @@
     """
     # try running the model
-    from sasmodels.core import load_model, call_kernel
-    model = load_model(path)
-
+    from sasmodels.sasview_model import load_custom_model
+    Model = load_custom_model(path)
+    model = Model()
     q =  np.array([0.01, 0.1])
-    kernel = model.make_kernel([q])
-    Iq = call_kernel(kernel, {})
-
+    Iq = model.evalDistribution(q)
     qx, qy =  np.array([0.01, 0.01]), np.array([0.1, 0.1])
-    kernel = model.make_kernel([qx, qy])
-    Iqxy = call_kernel(kernel, {})
+    Iqxy = model.evalDistribution([qx, qy])
 
     result = """
@@ -56 +53 @@
     except Exception:
         import traceback
-        result, errmsg = None, traceback.format_exc(limit=2)
+        result, errmsg = None, traceback.format_exc()
 
     parts = ["Running model '%s'..." % os.path.basename(fname)]