Changeset 9f8209b in sasview for src

Timestamp:

Jul 14, 2016 3:56:03 AM (8 years ago)

Author:

lewis

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:

da19985

Parents:

711e157 (diff), 0f1e140 (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 corfunc

Location:

src/sas

Files:

• sascalc/dataloader/readers/cansas_constants.py (modified) (2 diffs)
• sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (8 diffs)
• sascalc/corfunc/__init__.py (added)
• sascalc/corfunc/corfunc_calculator.py (added)
• sascalc/corfunc/transform_thread.py (added)
• sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (6 diffs)
• sasgui/perspectives/corfunc/__init__.py (added)
• sasgui/perspectives/corfunc/corfunc.py (added)
• sasgui/perspectives/corfunc/corfunc_panel.py (added)
• sasgui/perspectives/corfunc/corfunc_state.py (added)
• sasgui/perspectives/corfunc/media/corfunc_help.rst (added)
• sasgui/perspectives/corfunc/media/fig1.gif (added)
• sasgui/perspectives/corfunc/media/fig2.gif (added)
• sasgui/perspectives/corfunc/media/tutorial1.png (added)
• sasgui/perspectives/corfunc/media/tutorial2.png (added)
• sasgui/perspectives/corfunc/media/tutorial3.png (added)
• sasgui/perspectives/corfunc/plot_labels.py (added)

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

@@ -106 +106 @@
                        "unit" : "x_unit",
                        "attributes" : {"unit" :
-                                       {"variable" : "{0}._xunit = \"{1}\"",
+                                       {"variable" : "{0}.xaxis(\"Q\", \'{1}\')",
                                         "storeas" : "content"
                                        }
@@ -114 +114 @@
                        "unit" : "y_unit",
                        "attributes" : {"unit" :
-                                       {"variable" : "{0}._yunit = \"{1}\"",
+                                       {"variable" : "{0}.yaxis(\"Intensity\", \'{1}\')",
                                         "storeas" : "content"
                                        }

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

@@ -109 +109 @@
             attr_keys = value.attrs.keys()
             attr_values = value.attrs.values()
-            class_name = value.attrs.get(u'NX_class')
+            if value.attrs.get(u'canSAS_class') is not None:
+                class_name = value.attrs.get(u'canSAS_class')
+            else:
+                class_name = value.attrs.get(u'NX_class')
             if class_name is not None:
                 class_prog = re.compile(class_name)
@@ -131 +134 @@
                 for data_point in data_set:
                     ## Top Level Meta Data
+                    unit = self._get_unit(value)
                     if key == u'definition':
                         self.current_dataset.meta_data['reader'] = data_point
@@ -142 +146 @@
                     ## I and Q Data
                     elif key == u'I':
-                        i_unit = value.attrs.get(u'unit')
                         if type(self.current_dataset) is Data2D:
                             self.current_dataset.data = np.append(self.current_dataset.data, data_point)
-                            self.current_dataset.zaxis("Intensity (%s)" % (i_unit), i_unit)
+                            self.current_dataset.zaxis("Intensity", unit)
                         else:
                             self.current_dataset.y = np.append(self.current_dataset.y, data_point)
-                            self.current_dataset.yaxis("Intensity (%s)" % (i_unit), i_unit)
+                            self.current_dataset.yaxis("Intensity", unit)
                     elif key == u'Idev':
                         if type(self.current_dataset) is Data2D:
@@ -155 +158 @@
                             self.current_dataset.dy = np.append(self.current_dataset.dy, data_point)
                     elif key == u'Q':
-                        q_unit = value.attrs.get(u'unit')
-                        self.current_dataset.xaxis("Q (%s)" % (q_unit), q_unit)
+                        self.current_dataset.xaxis("Q", unit)
                         if type(self.current_dataset) is Data2D:
                             self.current_dataset.q = np.append(self.current_dataset.q, data_point)
@@ -162 +164 @@
                             self.current_dataset.x = np.append(self.current_dataset.x, data_point)
                     elif key == u'Qy':
-                        q_unit = value.attrs.get(u'unit')
-                        self.current_dataset.yaxis("Q (%s)" % (q_unit), q_unit)
+                        self.current_dataset.yaxis("Q_y", unit)
                         self.current_dataset.qy_data = np.append(self.current_dataset.qy_data, data_point)
                     elif key == u'Qydev':
                         self.current_dataset.dqy_data = np.append(self.current_dataset.dqy_data, data_point)
                     elif key == u'Qx':
-                        q_unit = value.attrs.get(u'unit')
-                        self.current_dataset.xaxis("Q (%s)" % (q_unit), q_unit)
+                        self.current_dataset.xaxis("Q_x", unit)
                         self.current_dataset.qx_data = np.append(self.current_dataset.qx_data, data_point)
                     elif key == u'Qxdev':
@@ -191 +191 @@
                     elif key == u'SDD' and parent == u'SASdetector':
                         self.detector.distance = data_point
-                        self.detector.distance_unit = value.attrs.get(u'unit')
+                        self.detector.distance_unit = unit
                     elif key == u'SSD' and parent == u'SAScollimation':
                         self.collimation.length = data_point
-                        self.collimation.length_unit = value.attrs.get(u'unit')
+                        self.collimation.length_unit = unit
                     elif key == u'name' and parent == u'SAScollimation':
                         self.collimation.name = data_point
@@ -221 +221 @@
                     elif key == u'wavelength' and parent == u'SASdata':
                         self.source.wavelength = data_point
-                        self.source.wavelength.unit = value.attrs.get(u'unit')
+                        self.source.wavelength.unit = unit
                     elif key == u'radiation' and parent == u'SASsource':
                         self.source.radiation = data_point
@@ -426 +426 @@
             name = self._create_unique_key(dictionary, name, numb)
         return name
+
+    def _get_unit(self, value):
+        """
+        Find the unit for a particular value within the h5py dictionary
+
+        :param value: attribute dictionary for a particular value set
+        :return:
+        """
+        unit = value.attrs.get(u'units')
+        if unit == None:
+            unit = value.attrs.get(u'unit')
+
+        ## Convert the unit formats
+        if unit == "1/A":
+            unit = "A^{-1}"
+        elif unit == "1/cm":
+            unit = "cm^{-1}"
+
+        return unit

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -95 +95 @@
         self.parent.SetFocus()
 
+        # If true, there are 3 qrange bars
+        self.is_corfunc = False
+
 
     def get_symbol_label(self):
@@ -214 +217 @@
         if active_ctrl == None:
             return
+        if hasattr(event, 'is_corfunc'):
+            self.is_corfunc = event.is_corfunc
         if event.id in self.plots.keys():
             ctrl = event.ctrl
@@ -222 +227 @@
             values = [max(x_data.min(), float(ctrl[0].GetValue())),
                       min(x_data.max(), float(ctrl[1].GetValue()))]
+            if len(ctrl) == 3:
+                colors.append('purple')
+                values.append(min(x_data.max(), float(ctrl[2].GetValue())))
             if self.ly == None:
                 self.ly = []
@@ -293 +301 @@
         ly0x = ly[0].get_xdata()
         ly1x = ly[1].get_xdata()
+        ly2x = None
+        if self.is_corfunc: ly2x = ly[2].get_xdata()
         self.q_ctrl[0].SetBackgroundColour('white')
         self.q_ctrl[1].SetBackgroundColour('white')
@@ -306 +316 @@
                 self.q_ctrl[0].SetValue(str(pos_x))
                 self.q_ctrl[1].SetBackgroundColour('pink')
+        elif ly2x is not None and ly1x >= ly2x:
+            if self.vl_ind == 1:
+                ly[2].set_xdata(posx)
+                ly[2].set_zorder(nop)
+                self.q_ctrl[2].SetValue(str(pos_x))
+            elif self.vl_ind == 2:
+                ly[1].set_xdata(posx)
+                ly[1].set_zorder(nop)
+                self.q_ctrl[1].SetValue(str(pos_x))
+
 
     def _get_cusor_lines(self, event):
@@ -325 +345 @@
             dqmin = math.fabs(event.xdata - self.ly[0].get_xdata())
             dqmax = math.fabs(event.xdata - self.ly[1].get_xdata())
-            is_qmax = dqmin > dqmax
-            if is_qmax:
-                self.vl_ind = 1
+            if not self.is_corfunc:
+                is_qmax = dqmin > dqmax
+                if is_qmax:
+                    self.vl_ind = 1
+                else:
+                    self.vl_ind = 0
             else:
-                self.vl_ind = 0
+                dqmax2 = math.fabs(event.xdata - self.ly[2].get_xdata())
+                closest = min(dqmin, dqmax, dqmax2)
+                self.vl_ind = { dqmin: 0, dqmax: 1, dqmax2: 2 }.get(closest)
 
     def cusor_line(self, event):