Changeset 5e906207 in sasview

Timestamp:

Aug 23, 2016 12:06:09 PM (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:

b61bd57

Parents:

f00691d4

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/23/16 11:45:23)

git-committer:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/23/16 12:06:09)

Message:

Read all metadata from HDF5 files

Location:

src/sas/sascalc

Files:

• dataloader/readers/cansas_reader_HDF5.py (modified) (4 diffs)
• file_converter/nxcansas_writer.py (modified) (1 diff)

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

@@ -23 +23 @@
 
     Any number of SASdata sets may be present in a SASentry and the data within can be either 1D I(Q) or 2D I(Qx, Qy).
+
+    Also supports reading NXcanSAS formatted HDF5 files
 
     :Dependencies:
@@ -205 +207 @@
                     elif key == u'temperature' and self.parent_class == u'SASsample':
                         self.current_datainfo.sample.temperature = data_point
+                    elif key == u'transmission' and self.parent_class == u'SASsample':
+                        self.current_datainfo.sample.transmission = data_point
+                    elif key == u'x_position' and self.parent_class == u'SASsample':
+                        self.current_datainfo.sample.position.x = data_point
+                    elif key == u'y_position' and self.parent_class == u'SASsample':
+                        self.current_datainfo.sample.position.y = data_point
+                    elif key == u'polar_angle' and self.parent_class == u'SASsample':
+                        self.current_datainfo.sample.orientation.x = data_point
+                    elif key == u'azimuthal_angle' and self.parent_class == u'SASsample':
+                        self.current_datainfo.sample.orientation.z = data_point
+                    elif key == u'details' and self.parent_class == u'SASsample':
+                        self.current_datainfo.sample.details.append(data_point)
 
                     ## Instrumental Information
@@ -214 +228 @@
                         self.detector.distance = float(data_point)
                         self.detector.distance_unit = unit
+                    elif key == u'slit_length' and self.parent_class == u'SASdetector':
+                        self.detector.slit_length = float(data_point)
+                        self.detector.slit_length_unit = unit
+                    elif key == u'x_position' and self.parent_class == u'SASdetector':
+                        self.detector.offset.x = float(data_point)
+                        self.detector.offset_unit = unit
+                    elif key == u'y_position' and self.parent_class == u'SASdetector':
+                        self.detector.offset.y = float(data_point)
+                        self.detector.offset_unit = unit
+                    elif key == u'polar_angle' and self.parent_class == u'SASdetector':
+                        self.detector.orientation.x = float(data_point)
+                        self.detector.orientation_unit = unit
+                    elif key == u'azimuthal_angle' and self.parent_class == u'SASdetector':
+                        self.detector.orientation.z = float(data_point)
+                        self.detector.orientation_unit = unit
+                    elif key == u'beam_center_x' and self.parent_class == u'SASdetector':
+                        self.detector.beam_center.x = float(data_point)
+                        self.detector.beam_center_unit = unit
+                    elif key == u'beam_center_y' and self.parent_class == u'SASdetector':
+                        self.detector.beam_center.y = float(data_point)
+                        self.detector.beam_center_unit = unit
+                    elif key == u'x_pixel_size' and self.parent_class == u'SASdetector':
+                        self.detector.pixel_size.x = float(data_point)
+                        self.detector.pixel_size_unit = unit
+                    elif key == u'y_pixel_size' and self.parent_class == u'SASdetector':
+                        self.detector.pixel_size.y = float(data_point)
+                        self.detector.pixel_size_unit = unit
                     elif key == u'SSD' and self.parent_class == u'SAScollimation':
                         self.collimation.length = data_point
@@ -242 +283 @@
                         self.trans_spectrum.wavelength.append(data_point)
 
-                    ## Other Information
+                    ## Source
                     elif key == u'wavelength' and self.parent_class == u'SASdata':
                         self.current_datainfo.source.wavelength = data_point
-                        self.current_datainfo.source.wavelength.unit = unit
+                        self.current_datainfo.source.wavelength_unit = unit
+                    elif key == u'incident_wavelength' and self.parent_class == u'SASsource':
+                        self.current_datainfo.source.wavelength = data_point
+                        self.current_datainfo.source.wavelength_unit = unit
+                    elif key == u'wavelength_max' and self.parent_class == u'SASsource':
+                        self.current_datainfo.source.wavelength_max = data_point
+                        self.current_datainfo.source.wavelength_max_unit = unit
+                    elif key == u'wavelength_min' and self.parent_class == u'SASsource':
+                        self.current_datainfo.source.wavelength_min = data_point
+                        self.current_datainfo.source.wavelength_min_unit = unit
+                    elif key == u'wavelength_spread' and self.parent_class == u'SASsource':
+                        self.current_datainfo.source.wavelength_spread = data_point
+                        self.current_datainfo.source.wavelength_spread_unit = unit
+                    elif key == u'beam_size_x' and self.parent_class == u'SASsource':
+                        self.current_datainfo.source.beam_size.x = data_point
+                        self.current_datainfo.source.beam_size_unit = unit
+                    elif key == u'beam_size_y' and self.parent_class == u'SASsource':
+                        self.current_datainfo.source.beam_size.y = data_point
+                        self.current_datainfo.source.beam_size_unit = unit
+                    elif key == u'beam_shape' and self.parent_class == u'SASsource':
+                        self.current_datainfo.source.beam_shape = data_point
                     elif key == u'radiation' and self.parent_class == u'SASsource':
                         self.current_datainfo.source.radiation = data_point

src/sas/sascalc/file_converter/nxcansas_writer.py

@@ -139 +139 @@
         if data_info.sample.details is not None\
             and data_info.sample.details != []:
-            details = reduce(lambda x,y: x + "\n" + y, data_info.sample.details)
-            sample_entry['details'] = _h5_string(details)
+            details = None
+            if len(data_info.sample.details) > 1:
+                details = [np.string_(d) for d in data_info.sample.details]
+                details = np.array(details)
+            elif data_info.sample.details != []:
+                details = _h5_string(data_info.sample.details[0])
+            if details is not None:
+                sample_entry.create_dataset('details', data=details)
 
         # Instrumment metadata