Changeset 80963c6c in sasview for src/sas

Timestamp:

Feb 7, 2019 6:02:47 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

a1b49a7

Parents:

a74dd016 (diff), a0f3c29 (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 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

Location:

src/sas

Files:

• qtgui/Plotting/Plotter2D.py (modified) (1 diff)
• sascalc/dataloader/data_info.py (modified) (1 diff)
• sascalc/dataloader/readers/cansas_reader.py (modified) (1 diff)
• qtgui/Perspectives/Inversion/InversionLogic.py (modified) (1 diff)
• qtgui/Perspectives/Inversion/InversionPerspective.py (modified) (1 diff)

src/sas/qtgui/Plotting/Plotter2D.py

@@ -468 +468 @@
         # check scale
         if self.scale == 'log_{10}':
-            with numpy.errstate(all='ignore'):
-                output = numpy.log10(output)
-            index = numpy.isfinite(output)
-            if not index.all():
-                cutoff = (numpy.quantile(output[index], 0.05) - numpy.log10(2) if index.any() else 0.)
-                output[output < cutoff] = cutoff
-                output[~index] = cutoff
+            #with numpy.errstate(all='ignore'):
+            #    output = numpy.log10(output)
+            #index = numpy.isfinite(output)
+            #if not index.all():
+            #    cutoff = (numpy.quantile(output[index], 0.05) - numpy.log10(2) if index.any() else 0.)
+            #    output[output < cutoff] = cutoff
+            #    output[~index] = cutoff
+            try:
+                if  self.zmin <= 0  and len(output[output > 0]) > 0:
+                    zmin_temp = self.zmin
+                    output[output > 0] = numpy.log10(output[output > 0])
+                elif self.zmin <= 0:
+                    zmin_temp = self.zmin
+                    output[output > 0] = numpy.zeros(len(output))
+                    output[output <= 0] = MIN_Z
+                else:
+                    zmin_temp = self.zmin
+                    output[output > 0] = numpy.log10(output[output > 0])
+            except:
+                #Too many problems in 2D plot with scale
+                output[output > 0] = numpy.log10(output[output > 0])
+                pass
+
         vmin, vmax = None, None
 

src/sas/sascalc/dataloader/data_info.py

@@ -1188 +1188 @@
         final_dataset.yaxis(data._yaxis, data._yunit)
         final_dataset.zaxis(data._zaxis, data._zunit)
-        final_dataset.y_bins = data.y_bins
-        final_dataset.x_bins = data.x_bins
+        if hasattr(data, 'y_bins'):
+            final_dataset.y_bins = data.y_bins
+        if hasattr(data, 'y_bins'):
+            final_dataset.x_bins = data.x_bins
     else:
         return_string = ("Should Never Happen: _combine_data_info_with_plottabl"

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

@@ -493 +493 @@
                 self.current_datainfo.errors.add(error)
             self.data_cleanup()
-            self.sort_one_d_data()
-            self.sort_two_d_data()
+            # Where are these defined??
+            #self.sort_one_d_data()
+            #self.sort_two_d_data()
             self.reset_data_list()
             return self.output[0], None

src/sas/qtgui/Perspectives/Inversion/InversionLogic.py

@@ -156 +156 @@
         return new_plot
 
+    def add_errors(self, sigma=0.05):
+        """
+        Adds errors to data set is they are not available.
+        Uses  $\Delta y = \sigma | y |$.
+        """
+        self._data.dy = sigma * np.fabs(self._data.y)
+
     def computeDataRange(self):
         """

src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

@@ -473 +473 @@
             self._calculator.set_qmax(qmax)
             if np.size(self.logic.data.dy) == 0 or np.all(self.logic.data.dy) == 0:
-                self._calculator.add_errors()
+                self.logic.add_errors()
             self.updateDataList(data)
             self.populateDataComboBox(self.logic.data.filename, data)