Changeset fe498b83 in sasview

Timestamp:

Aug 19, 2016 5:20:16 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:

edf0e06

Parents:

ac370c5

Message:

Refactor to make use of x_bins and y_bins

Location:

src/sas

Files:

• sascalc/file_converter/bsl_loader.py (modified) (2 diffs)
• sascalc/file_converter/nxcansas_writer.py (modified) (4 diffs)
• sasgui/perspectives/file_converter/converter_panel.py (modified) (2 diffs)

src/sas/sascalc/file_converter/bsl_loader.py

@@ -1 +1 @@
 from sas.sascalc.file_converter.core.bsl_loader import CLoader
+from sas.sascalc.dataloader.data_info import Data2D
 from copy import deepcopy
 import os
@@ -79 +80 @@
             data_info['pixels'], data_info['rasters'], data_info['swap_bytes'])
 
+    def load_frames(self, frames):
+        frame_data = []
+        # Prepare axis values (arbitrary scale)
+        x = self.n_rasters * range(1, self.n_pixels+1)
+        y = [self.n_pixels * [i] for i in range(1, self.n_rasters+1)]
+        y = np.reshape(y, (1, self.n_pixels*self.n_rasters))[0]
+        x_bins = x[:self.n_pixels]
+        y_bins = y[0::self.n_pixels]
+
+        for frame in frames:
+            self.frame = frame
+            raw_frame_data = self.load_data()
+            data2d = Data2D(data=raw_frame_data, qx_data=x, qy_data=y)
+            data2d.x_bins = x_bins
+            data2d.y_bins = y_bins
+            frame_data.append(data2d)
+
+        return frame_data
+
+
     def __setattr__(self, name, value):
         if name == 'filename':

src/sas/sascalc/file_converter/nxcansas_writer.py

@@ -22 +22 @@
     """
 
-    def write(self, dataset, filename, dimensions=[]):
+    def write(self, dataset, filename):
         """
         Write an array of Data1d or Data2D objects to an NXcanSAS file, as
@@ -79 +79 @@
                 self._write_1d_data(data_obj, data_entry)
             elif isinstance(data_obj, Data2D):
-                self._write_2d_data(data_obj, data_entry, dimensions)
+                self._write_2d_data(data_obj, data_entry)
             i += 1
 
@@ -158 +158 @@
         data_entry.create_dataset('Idev', data=data_obj.dy)
 
-    def _write_2d_data(self, data, data_entry, dimensions):
+    def _write_2d_data(self, data, data_entry):
         """
         Writes the contents of a Data2D object to a SASdata h5py Group
@@ -170 +170 @@
         data_entry.attrs['Q_indicies'] = [0,1]
 
-        (n_rows, n_cols) = (None, None)
-        try:
-            (n_rows, n_cols) = dimensions.pop(0)
-        except:
-            pass
+        (n_rows, n_cols) = (len(data.y_bins), len(data.x_bins))
 
-        if n_rows == None and n_cols == None:
+        if n_rows == 0 and n_cols == 0:
             # Calculate rows and columns, assuming detector is square
             # Same logic as used in PlotPanel.py _get_bins

src/sas/sasgui/perspectives/file_converter/converter_panel.py

@@ -224 +224 @@
 
         if not should_continue:
-            return None, None, None
-
-        frame_data = {}
-
-        for frame in frames:
-            loader.frame = frame
-            frame_data[frame] = loader.load_data()
-
-        # Prepare axes values (arbitrary scale)
-        x_data = loader.n_rasters * range(1,loader.n_pixels+1)
-        y_data = [loader.n_pixels * [i] for i in range(1, loader.n_rasters+1)]
-        y_data = np.reshape(y_data, (1, loader.n_pixels*loader.n_rasters))[0]
-
-        return (x_data, y_data), (loader.n_rasters, loader.n_pixels), frame_data
+            return None
+
+        frame_data = loader.load_frames(frames)
+
+        return frame_data
 
     def ask_frame_range(self, n_frames):
@@ -300 +291 @@
             else: # self.data_type == 'bsl'
 
-                (x, y), dimensions, frame_data = \
-                    self.extract_bsl_data(self.iq_input.GetPath())
-                if x == None and y == None and frame_data == None:
+                dataset = self.extract_bsl_data(self.iq_input.GetPath())
+                if dataset is None:
                     # Cancelled by user
                     return
 
-                dataset = []
-                for i_data in frame_data.values():
-                    i_data = np.reshape(i_data, (1, i_data.size))[0]
-                    data2d = Data2D(data=i_data, qx_data=x, qy_data=y)
-                    dataset.append(data2d)
                 w = NXcanSASWriter()
-                dimensions = [dimensions] * len(dataset)
-                w.write(dataset, self.output.GetPath(), dimensions=dimensions)
+                w.write(dataset, self.output.GetPath())
 
                 wx.PostEvent(self.parent.manager.parent,