Changeset 505706a in sasview for src/sas/sascalc

Timestamp:

Dec 20, 2016 7:59:08 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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b61bd57

Parents:

d3911e3 (diff), 06a4306 (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:

Merge branch 'master' into ticket-811

Location:

src/sas/sascalc

Files:

• dataloader/manipulations.py (modified) (2 diffs)
• dataloader/readers/cansas_reader_HDF5.py (modified) (1 diff)
• data_util/qsmearing.py (modified) (2 diffs)
• fit/AbstractFitEngine.py (modified) (1 diff)

src/sas/sascalc/dataloader/manipulations.py

@@ -143 +143 @@
         :return: Data1D object
         """
-        if len(data2D.detector) != 1:
+        if len(data2D.detector) > 1:
             msg = "_Slab._avg: invalid number of "
             msg += " detectors: %g" % len(data2D.detector)
@@ -299 +299 @@
             error on number of counts, number of entries summed
         """
-        if len(data2D.detector) != 1:
+        if len(data2D.detector) > 1:
             msg = "Circular averaging: invalid number "
             msg += "of detectors: %g" % len(data2D.detector)

src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py

@@ -162 +162 @@
                     else:
                         self.current_dataset.x = data_set.flatten()
+                    continue
+                elif key == u'Qdev':
+                    self.current_dataset.dx = data_set.flatten()
                     continue
                 elif key == u'Qy':

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: