Changeset 1ddf8f0 in sasview

Timestamp:

Aug 18, 2016 4:56:48 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:

1f6d293

Parents:

88d85c6

Message:

Use Data object to set sasentry attributes

File:

• src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (3 diffs)

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

@@ -380 +380 @@
         self.current_datainfo = DataInfo()
 
-    def write(self, dataset, filename, entry_attrs={ 'title':'', 'run_number':'', 'run_name':'' }):
+    def write(self, dataset, filename):
         """
         Write an array of Data1d or Data2D objects to a CanSAS 2.0 file, as
@@ -389 +389 @@
         :param dataset: A list of Data1D or Data2D objects to write
         :param filename: Where to write the CanSAS 2.0 file
-        :entry_attrs: A dictionary containing the attributes of the SASEntry
         """
         is_1d = all([isinstance(d, Data1D) for d in dataset])
@@ -410 +409 @@
             return np.array([np.string_(string)])
 
+        # Get run name and number from first Data object
+        data_info = dataset[0]
+        run_number = ''
+        run_name = ''
+        if len(data_info.run) > 0:
+            run_number = data_info.run[0]
+            if len(data_info.run_name) > 0:
+                run_name = data_info.run_name[run_number]
+
         f = h5py.File(filename, 'w')
         sasentry = f.create_group('sasentry01')
         sasentry['definition'] = _h5_string('NXcanSAS')
-        sasentry['run'] = _h5_string(entry_attrs['run_number'])
-        sasentry['run'].attrs['name'] = entry_attrs['run_name']
-        sasentry['title'] = _h5_string(entry_attrs['title'])
+        sasentry['run'] = _h5_string(run_number)
+        sasentry['run'].attrs['name'] = run_name
+        sasentry['title'] = _h5_string(data_info.title)
         sasentry.attrs['canSAS_class'] = 'SASentry'
         sasentry.attrs['version'] = '1.0'