Changeset 88d85c6 in sasview for src/sas/sascalc/dataloader

Timestamp:

Aug 17, 2016 11:55:19 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:

1ddf8f0

Parents:

54ba66e

Message:

Ensure SASdetector and SASsample are written/read correctly

File:

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

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

@@ -184 +184 @@
                     elif key == u'Title' and self.parent_class == u'SASsample':
                         self.current_datainfo.sample.name = data_point
+                    elif key == u'name' and self.parent_class == u'SASsample':
+                        self.current_datainfo.sample.name = data_point
                     elif key == u'thickness' and self.parent_class == u'SASsample':
                         self.current_datainfo.sample.thickness = data_point
@@ -207 +209 @@
                         self.process.name = data_point
                     elif key == u'Title' and self.parent_class == u'SASprocess':
+                        self.process.name = data_point
+                    elif key == u'name' and self.parent_class == u'SASprocess':
                         self.process.name = data_point
                     elif key == u'description' and self.parent_class == u'SASprocess':
@@ -433 +437 @@
             sample_entry = sasentry.create_group('sassample')
             sample_entry.attrs['canSAS_class'] = 'SASsample'
-            sample_entry.attrs['name'] = data_info.sample.name
-            sample_entry['ID'] = _h5_string(data_info.sample.name)
+            sample_entry['name'] = _h5_string(data_info.sample.name)
             sample_attrs = ['thickness', 'temperature']
             for key in sample_attrs:
                 if getattr(data_info.sample, key) is not None:
                     sample_entry.create_dataset(key, data=np.array([getattr(data_info.sample, key)]))
-                    # sample_entry[key] = np.array(getattr(data_info.sample, key),
-                    #     dtype=np.float32)
 
             instrument_entry = sasentry.create_group('sasinstrument')
@@ -472 +473 @@
                     detector_entry = instrument_entry.create_group(
                         'sasdetector{0:0=2d}'.format(i))
-                    detector_entry.attrs['casnSAS_class'] = 'SASdetector'
+                    detector_entry.attrs['canSAS_class'] = 'SASdetector'
                     if det_info.distance is not None:
                         detector_entry['SDD'] = det_info.distance
@@ -482 +483 @@
             else:
                 detector_entry = instrument_entry.create_group('sasdetector01')
-                detector_entry.attrs['casnSAS_class'] = 'SASdetector'
+                detector_entry.attrs['canSAS_class'] = 'SASdetector'
                 detector_entry.attrs['name'] = ''