Changeset 0836f77 in sasview for src/sas

Timestamp:

Aug 23, 2016 7:34:13 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:

7fce2bc

Parents:

9ddffe0

Message:

Write source metadata to NXcanSAS

File:

• src/sas/sascalc/file_converter/nxcansas_writer.py (modified) (4 diffs)

src/sas/sascalc/file_converter/nxcansas_writer.py

@@ -47 +47 @@
             entry[key] = _h5_string(value)
 
-
         def _h5_float(x):
             if not (isinstance(x, list)):
@@ -58 +57 @@
         def _write_h5_vector(entry, vector, names=['x_position', 'y_position'],
             units=None, write_fn=_write_h5_string):
+            """
+            Write a vector to an h5 entry
+
+            :param entry: The H5Py entry to write to
+            :param vector: The Vector to write
+            :param names: What to call the x,y and z components of the vector
+                when writing to the H5Py entry
+            :param units: The units of the vector (optional)
+            :param write_fn: A function to convert the value to the required
+                format and write it to the H5Py entry, of the form
+                f(entry, value, name) (optional)
+            """
             if len(names) < 2:
                 raise ValueError("Length of names must be >= 2.")
@@ -121 +132 @@
         # and yaw. The _write_h5_vector method writes vector.y, but we
         # need to write vector.z for yaw
-        data_info.sample.orientation.y = data_info.orientation.z
+        data_info.sample.orientation.y = data_info.sample.orientation.z
         _write_h5_vector(sample_entry, data_info.sample.orientation,
             names=['polar_angle', 'azimuthal_angle'])
+        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)
 
         # Instrumment metadata
@@ -137 +152 @@
         else:
             source_entry['radiation'] = _h5_string(data_info.source.radiation)
+        if data_info.source.beam_shape is not None:
+            source_entry['beam_shape'] = _h5_string(data_info.source.beam_shape)
+        wavelength_keys = { 'wavelength': 'incident_wavelength',
+            'wavelength_min':'wavelength_min',
+            'wavelength_max': 'wavelength_max',
+            'wavelength_spread': 'incident_wavelength_spread' }
+        for sasname, nxname in wavelength_keys.iteritems():
+            value = getattr(data_info.source, sasname)
+            units = getattr(data_info.source, sasname + '_unit')
+            if value is not None:
+                source_entry[nxname] = _h5_float(value)
+                source_entry[nxname].attrs['units'] = units
+        _write_h5_vector(source_entry, data_info.source.beam_size,
+            names=['beam_size_x', 'beam_size_y'],
+            units=data_info.source.beam_size_unit, write_fn=_write_h5_float)
+
 
         # Collimation metadata