Changeset 346d56e in sasview

Timestamp:

Aug 19, 2016 4:43:06 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:

a14fa99

Parents:

995f4eb

Message:

Allow adding metadata to 2d files and ensure it's written correctly

Location:

src/sas

Files:

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

src/sas/sascalc/file_converter/nxcansas_writer.py

@@ -62 +62 @@
                 run_name = data_info.run_name[run_number]
 
+        import pdb; pdb.set_trace()
+
         f = h5py.File(filename, 'w')
         sasentry = f.create_group('sasentry01')
@@ -90 +92 @@
             if getattr(data_info.sample, key) is not None:
                 sample_entry.create_dataset(key,
-                    data=np.array([getattr(data_info.sample, key)]))
+                    data=_h5_float(getattr(data_info.sample, key)))
 
         instrument_entry = sasentry.create_group('sasinstrument')
@@ -183 +185 @@
         I = np.reshape(data.data, (n_rows, n_cols))
         dI = np.zeros((n_rows, n_cols))
-        # import pdb; pdb.set_trace()
         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))
+
         I_entry = data_entry.create_dataset('I', data=I)
         I_entry.attrs['units'] = data.I_unit

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

@@ -364 +364 @@
                 for key, value in metadata.iteritems():
                     setattr(dataset[0], key, value)
+                if self.run != []:
+                    run_number = self.run[0]
+                    dataset[0].run_name[run_number] = self.run_name
 
                 w = NXcanSASWriter()
@@ -463 +466 @@
             self.q_input.SetPath("")
             self.q_input.Disable()
-            # self.radiation_input.Disable()
-            # self.metadata_section.Collapse()
-            # self.on_collapsible_pane(None)
-            # self.metadata_section.Disable()
             self.output.SetWildcard("NXcanSAS HDF5 File (*.h5)|*.h5")
         else: