Changeset bb3eb744 in sasview

Timestamp:

Dec 21, 2016 9:31:55 AM (7 years ago)

Author:

GitHub <noreply@…>

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b61bd57, b0bebdc

Parents:

24fd27a (diff), 505706a (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.

git-author:

Jeff Krzywon <krzywon@…> (12/21/16 09:31:55)

git-committer:

GitHub <noreply@…> (12/21/16 09:31:55)

Message:

Merge pull request #28 from SasView?/ticket-811

Ticket 811

Location:

src/sas

Files:

• sascalc/data_util/qsmearing.py (modified) (2 diffs)
• sascalc/fit/AbstractFitEngine.py (modified) (1 diff)
• sasgui/guiframe/gui_manager.py (modified) (2 diffs)
• sasgui/perspectives/fitting/basepage.py (modified) (5 diffs)
• sasgui/perspectives/fitting/model_thread.py (modified) (2 diffs)
• sasgui/perspectives/fitting/fitpage.py (modified) (1 diff)

src/sas/sascalc/data_util/qsmearing.py

@@ -41 +41 @@
         elif data.dqx_data == None or data.dqy_data == None:
             return None
-        return Pinhole2D(data)
+        return PySmear2D(data, model)
 
     if  not hasattr(data, "dx") and not hasattr(data, "dxl")\
@@ -142 +142 @@
     width = data.dx if data.dx is not None else 0
     return PySmear(Pinhole1D(q, width), model)
+
+
+class PySmear2D(object):
+    """
+    Q smearing class for SAS 2d pinhole data
+    """
+
+    def __init__(self, data=None, model=None):
+        self.data = data
+        self.model = model
+        self.accuracy = 'Low'
+        self.limit = 3.0
+        self.index = None
+        self.coords = 'polar'
+        self.smearer = True
+
+    def set_accuracy(self, accuracy='Low'):
+        """
+        Set accuracy.
+
+        :param accuracy:  string
+        """
+        self.accuracy = accuracy
+
+    def set_smearer(self, smearer=True):
+        """
+        Set whether or not smearer will be used
+
+        :param smearer: smear object
+
+        """
+        self.smearer = smearer
+
+    def set_data(self, data=None):
+        """
+        Set data.
+
+        :param data: DataLoader.Data_info type
+        """
+        self.data = data
+
+    def set_model(self, model=None):
+        """
+        Set model.
+
+        :param model: sas.models instance
+        """
+        self.model = model
+
+    def set_index(self, index=None):
+        """
+        Set index.
+
+        :param index: 1d arrays
+        """
+        self.index = index
+
+    def get_value(self):
+        """
+        Over sampling of r_nbins times phi_nbins, calculate Gaussian weights,
+        then find smeared intensity
+        """
+        if self.smearer:
+            res = Pinhole2D(data=self.data, index=self.index,
+                            nsigma=3.0, accuracy=self.accuracy,
+                            coords=self.coords)
+            val = self.model.evalDistribution(res.q_calc)
+            return res.apply(val)
+        else:
+            index = self.index if self.index is not None else slice(None)
+            qx_data = self.data.qx_data[index]
+            qy_data = self.data.qy_data[index]
+            q_calc = [qx_data, qy_data]
+            val = self.model.evalDistribution(q_calc)
+            return val
+

src/sas/sascalc/fit/AbstractFitEngine.py

@@ -359 +359 @@
         if self.smearer != None:
             fn.set_index(self.idx)
-            # Get necessary data from self.data and set the data for smearing
-            fn.get_data()
-
             gn = fn.get_value()
         else:

src/sas/sasgui/guiframe/gui_manager.py

@@ -1990 +1990 @@
                 wx.PostEvent(self,
                              StatusEvent(status="Completed saving."))
-            except:
+            except Exception:
                 msg = "Error occurred while saving: "
+                msg += traceback.format_exc()
                 msg += "To save, the application panel should have a data set.."
                 wx.PostEvent(self, StatusEvent(status=msg))
@@ -2040 +2041 @@
                 logging.warning(msg)
                 wx.PostEvent(self, StatusEvent(status=msg, info="error"))
-        except:
+        except Exception:
             msg = "Error occurred while saving: "
+            msg += traceback.format_exc()
             msg += "To save, at least one application panel "
             msg += "should have a data set.."

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/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

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]