Changeset afbd172 in sasview for src/sas/sascalc

Timestamp:

Aug 18, 2016 10:19:09 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:

7bd6860a

Parents:

eb98f24

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/18/16 10:18:22)

git-committer:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/18/16 10:19:09)

Message:

Pass 2D data dimesnsions to NXcanSASWriter to allow saving of non-sqaure data sets

File:

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

src/sas/sascalc/file_converter/nxcansas_writer.py

@@ -22 +22 @@
     """
 
-    def write(self, dataset, filename):
+    def write(self, dataset, filename, dimensions=[]):
         """
         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)
+                self._write_2d_data(data_obj, data_entry, dimensions)
             i += 1
 
@@ -137 +137 @@
 
         # TODO: implement writing SASnote
-        i = 0
+        i = 1
         note_entry = sasentry.create_group('sasnote{0:0=2d}'.format(i))
         note_entry.attrs['canSAS_class'] = 'SASnote'
@@ -158 +158 @@
         data_entry.create_dataset('Idev', data=data_obj.dy)
 
-    def _write_2d_data(self, data, data_entry):
+    def _write_2d_data(self, data, data_entry, dimensions):
         """
         Writes the contents of a Data2D object to a SASdata h5py Group
@@ -170 +170 @@
         data_entry.attrs['Q_indicies'] = [0,1]
 
-        # Calculate rows and columns, assuming detector is square
-        # Same logic as used in PlotPanel.py _get_bins
-        n_cols = int(np.floor(np.sqrt(len(data.qy_data))))
-        n_rows = int(np.floor(len(data.qy_data) / n_cols))
+        (n_rows, n_cols) = (None, None)
+        try:
+            (n_rows, n_cols) = dimensions.pop(0)
+        except:
+            pass
 
-        if n_rows * n_cols != len(data.qy_data):
-            raise ValueError("Unable to calculate dimensions of data")
+        if n_rows == None and n_cols == None:
+            # Calculate rows and columns, assuming detector is square
+            # Same logic as used in PlotPanel.py _get_bins
+            n_cols = int(np.floor(np.sqrt(len(data.qy_data))))
+            n_rows = int(np.floor(len(data.qy_data) / n_cols))
+
+            if n_rows * n_cols != len(data.qy_data):
+                raise ValueError("Unable to calculate dimensions of 2D data")
 
         I = np.reshape(data.data, (n_rows, n_cols))
-        dI = np.reshape(data.err_data, (n_rows, n_cols))
+        dI = np.zeros((n_rows, n_cols))
+        if not all(data.err_data == [None]):
+            dI = np.reshape(data.err_data, (n_rows, n_cols))
         qx =  np.reshape(data.qx_data, (n_rows, n_cols))
         qy = np.reshape(data.qy_data, (n_rows, n_cols))