Changeset b39debba in sasview for src/sas/sasgui/perspectives

Timestamp:

Jan 2, 2017 3:10:13 AM (8 years ago)

Author:

wojciech

Children:

25594ca

Parents:

6c6aa83 (diff), c1681ea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged with master

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (5 diffs)
• fitpage.py (modified) (1 diff)
• model_thread.py (modified) (4 diffs)
• fitting.py (modified) (3 diffs)
• gpu_options.py (added)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -1041 +1041 @@
                         disp_model = POLYDISPERSITY_MODELS['array']()
                         if hasattr(state, "values") and \
-                                 self.disp_cb_dict[item].GetValue() is True:
+                                 self.disp_cb_dict[item].GetValue():
                             if len(state.values) > 0:
                                 self.values = state.values
@@ -1541 +1541 @@
                         index_data = ((self.qmin_x <= self.data.x) &
                                       (self.data.x <= self.qmax_x))
-                        val = self.data.x[index_data is True]
-                        val = len(val) if isinstance(val, list) else 1
-                        self.Npts_fit.SetValue(str(val))
-
+                        val = str(len(self.data.x[index_data]))
+                        self.Npts_fit.SetValue(val)
                     else:
                         # No data in the panel
@@ -2147 +2145 @@
                 flag = False
             else:
-                self.Npts_fit.SetValue(str(len(index_data[index_data is True])))
+                self.Npts_fit.SetValue(str(len(index_data[index_data])))
                 self.fitrange = True
 
@@ -2182 +2180 @@
                 flag = False
             else:
-                val = index_data[index_data is True]
-                val = len(val) if isinstance(val, list) else 1
-                self.Npts_fit.SetValue(str(val))
+                self.Npts_fit.SetValue(str(len(index_data[index_data])))
                 self.fitrange = True
 
@@ -2628 +2624 @@
             Layout after self._draw_model
         """
-        if ON_MAC is True:
+        if ON_MAC:
             time.sleep(1)
 

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -1618 +1618 @@
                 return
         # check if it is pinhole smear and get min max if it is.
-        if data.dx is not None and not numpy.any(data.dx):
+        if data.dx is not None and numpy.any(data.dx):
             self.smear_type = "Pinhole"
             self.dq_l = data.dx[0]

src/sas/sasgui/perspectives/fitting/model_thread.py

@@ -82 +82 @@
             fn.set_model(self.model)
             fn.set_index(index_model)
-            # Get necessary data from self.data and set the data for smearing
-            fn.get_data()
             # Calculate smeared Intensity
             #(by Gaussian averaging): DataLoader/smearing2d/Smearer2D()
@@ -89 +87 @@
         else:
             # calculation w/o smearing
-            value = self.model.evalDistribution(\
-                [self.data.qx_data[index_model],
-                 self.data.qy_data[index_model]])
+            value = self.model.evalDistribution([
+                self.data.qx_data[index_model],
+                self.data.qy_data[index_model]
+            ])
         output = numpy.zeros(len(self.data.qx_data))
         # output default is None
@@ -198 +197 @@
             output[index] = self.model.evalDistribution(self.data.x[index])
 
-        sq_model = None
-        pq_model = None
+        sq_values = None
+        pq_values = None
+        s_model = None
+        p_model = None
         if isinstance(self.model, MultiplicationModel):
-            sq_model = numpy.zeros((len(self.data.x)))
-            pq_model = numpy.zeros((len(self.data.x)))
-            sq_model[index] = self.model.s_model.evalDistribution(self.data.x[index])
-            pq_model[index] = self.model.p_model.evalDistribution(self.data.x[index])
+            s_model = self.model.s_model
+            p_model = self.model.p_model
+        elif hasattr(self.model, "get_composition_models"):
+            p_model, s_model = self.model.get_composition_models()
+
+        if p_model is not None and s_model is not None:
+            sq_values = numpy.zeros((len(self.data.x)))
+            pq_values = numpy.zeros((len(self.data.x)))
+            sq_values[index] = s_model.evalDistribution(self.data.x[index])
+            pq_values[index] = p_model.evalDistribution(self.data.x[index])
 
         elapsed = time.time() - self.starttime
@@ -221 +228 @@
                       unsmeared_data=unsmeared_data,
                       unsmeared_error=unsmeared_error,
-                      pq_model=pq_model,
-                      sq_model=sq_model)
+                      pq_model=pq_values,
+                      sq_model=sq_values)
 
     def results(self):

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -45 +45 @@
 from sas.sasgui.guiframe.gui_manager import MDIFrame
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
+from sas.sasgui.perspectives.fitting.gpu_options import GpuOptions
 
 from . import models
@@ -192 +193 @@
         self.bumps_options_menu = self.menu1.FindItemById(self.id_bumps_options)
         self.bumps_options_menu.Enable(True)
+
+        self.id_gpu_options_panel = wx.NewId()
+        self.menu1.Append(self.id_gpu_options_panel, "OpenCL Options", "Choose OpenCL driver or turn it off")
+        wx.EVT_MENU(owner, self.id_gpu_options_panel, self.on_gpu_options)
 
         self.id_result_panel = wx.NewId()
@@ -801 +806 @@
         self.result_frame.Show()
         self.result_frame.Raise()
+
+    def on_gpu_options(self, event=None):
+        """
+        Make the Fit Results panel visible.
+        """
+        dialog = GpuOptions(None, wx.ID_ANY, "")
+        dialog.Show()
 
     def stop_fit(self, uid):