Changeset d09f462f in sasview for src/sas

Timestamp:

Feb 6, 2019 9:04:17 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

a0f3c29

Parents:

bda3ce4

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (02/06/19 09:02:58)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (02/06/19 09:04:17)

Message:

Some platforms still use older numpy without quantile(). Temporarily
revert the code.

File:

• src/sas/qtgui/Plotting/Plotter2D.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