Changes in / [80963c6c:a74dd016] in sasview

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)

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
-            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
-
+            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
         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)
-        if hasattr(data, 'y_bins'):
-            final_dataset.y_bins = data.y_bins
-        if hasattr(data, 'y_bins'):
-            final_dataset.x_bins = data.x_bins
+        final_dataset.y_bins = 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()
-            # Where are these defined??
-            #self.sort_one_d_data()
-            #self.sort_two_d_data()
+            self.sort_one_d_data()
+            self.sort_two_d_data()
             self.reset_data_list()
             return self.output[0], None