Changeset 9ddffe0 in sasview for src/sas/sascalc/file_converter

Timestamp:

Aug 23, 2016 8:31:46 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:

0836f77

Parents:

ac3353d

Message:

Correctly write orientation vectors

File:

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

src/sas/sascalc/file_converter/nxcansas_writer.py

@@ -118 +118 @@
                     data=_h5_float(getattr(data_info.sample, key)))
         _write_h5_vector(sample_entry, data_info.sample.position)
+        # NXcanSAS doesn't save information about pitch, only roll
+        # 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
         _write_h5_vector(sample_entry, data_info.sample.orientation,
             names=['polar_angle', 'azimuthal_angle'])
@@ -169 +173 @@
                     detector_entry['slit_length'].attrs['units'] = det_info.slit_length_unit
                 _write_h5_vector(detector_entry, det_info.offset)
+                # NXcanSAS doesn't save information about pitch, only roll
+                # and yaw. The _write_h5_vector method writes vector.y, but we
+                # need to write vector.z for yaw
+                det_info.orientation.y = det_info.orientation.z
                 _write_h5_vector(detector_entry, det_info.orientation,
                     names=['polar_angle', 'azimuthal_angle'])