Changeset fe498b83 in sasview for src/sas/sascalc/file_converter/nxcansas_writer.py

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

File:

• src/sas/sascalc/file_converter/nxcansas_writer.py (modified) (4 diffs)

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