Changeset be88076 in sasview

Timestamp:

Aug 23, 2016 10:39:36 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:

97e90b7

Parents:

7fce2bc

Message:

Correctly read and write run_name

Location:

src/sas

Files:

• sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (1 diff)
• sasgui/perspectives/file_converter/converter_panel.py (modified) (3 diffs)

src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py

@@ -185 +185 @@
                     elif key == u'run':
                         self.current_datainfo.run.append(data_point)
+                        try:
+                            run_name = value.attrs['name']
+                            run_dict = {data_point: run_name}
+                            self.current_datainfo.run_name = run_dict
+                        except:
+                            pass
                     elif key == u'title':
                         self.current_datainfo.title = data_point

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

@@ -284 +284 @@
             self.run = [self.run]
 
+        run_name = None
+        if len(self.run) > 0:
+            run_number = self.run[0]
+            run_name = { run_number: self.run_name }
+
         if self.title is None:
             self.title = ''
@@ -290 +295 @@
             'title': self.title,
             'run': self.run,
+            'run_name': run_name,
             'instrument': self.instrument,
             'detector': [self.detector],
@@ -370 +376 @@
                 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()