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

Timestamp:

Jun 22, 2016 12:23:20 PM (9 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

Location:

src/sas/sasgui/perspectives/calculator

Files:

• model_editor.py (modified) (9 diffs)
• pyconsole.py (modified) (2 diffs)

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

@@ -578 +578 @@
                     else:
                         out_f.write(line + "\n")
-                elif line.count("P1 = make_class"):
+                elif line.count("P1 = find_model"):
                     out_f.write(line % (name1) + "\n")
-                elif line.count("P2 = make_class"):
+                elif line.count("P2 = find_model"):
                     out_f.write(line % (name2) + "\n")
 
@@ -1238 +1238 @@
 ##import scipy?
 #class Model(Model1DPlugin):
-#    name = ""
+#    name = basename without extension of __file__
 #    def __init__(self):
 #        Model1DPlugin.__init__(self, name=self.name)
 #        #set name same as file name
-#        self.name = self.get_fname()
 #        #self.params here
 #        self.description = "%s"
@@ -1304 +1303 @@
 """
 TEST_TEMPLATE = """
-    def get_fname(self):
-        path = sys._getframe().f_code.co_filename
-        basename  = os.path.basename(path)
-        name, _ = os.path.splitext(basename)
-        return name
 ######################################################################
 ## THIS IS FOR TEST. DO NOT MODIFY THE FOLLOWING LINES!!!!!!!!!!!!!!!!
@@ -1335 +1329 @@
 
 from sas.sascalc.fit.pluginmodel import Model1DPlugin
-from sasmodels.sasview_model import make_class
-from sasmodels.core import load_model_info
-# User can change the name of the model (only with single functional model)
-#P1_model:
-#from %s import Model as P1
-
-#P2_model:
-#from %s import Model as P2
+from sasmodels.sasview_model import find_model
 
 class Model(Model1DPlugin):
-    name = ""
-    def __init__(self):
+    name = os.path.splitext(os.path.basename(__file__))[0]
+    is_multiplicity_model = False
+    def __init__(self, multiplicity=1):
         Model1DPlugin.__init__(self, name='')
-        P1 = make_class('%s')
-        P2 = make_class('%s')
+        P1 = find_model('%s')
+        P2 = find_model('%s')
         p_model1 = P1()
         p_model2 = P2()
         ## Setting  model name model description
         self.description = '%s'
-        self.name = self.get_fname()
         if self.name.rstrip().lstrip() == '':
             self.name = self._get_name(p_model1.name, p_model2.name)
@@ -1392 +1379 @@
         #list of parameter that can be fitted
         self._set_fixed_params()
+
         ## parameters with orientation
+        self.orientation_params = []
         for item in self.p_model1.orientation_params:
             new_item = "p1_" + item
@@ -1403 +1392 @@
                 self.orientation_params.append(new_item)
         ## magnetic params
+        self.magnetic_params = []
         for item in self.p_model1.magnetic_params:
             new_item = "p1_" + item
@@ -1460 +1450 @@
 
     def _set_dispersion(self):
+        self.dispersion = {}
         ##set dispersion only from p_model
         for name , value in self.p_model1.dispersion.iteritems():
@@ -1575 +1566 @@
 
     def _set_fixed_params(self):
+        self.fixed = []
         for item in self.p_model1.fixed:
             new_item = "p1" + item
@@ -1625 +1617 @@
         self.description += description
 
-    def get_fname(self):
-        path = sys._getframe().f_code.co_filename
-        basename  = os.path.basename(path)
-        name, _ = os.path.splitext(basename)
-        return name
-
 if __name__ == "__main__":
     m1= Model()

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)]