Changeset 1f6d293 in sasview for src/sas/sascalc/dataloader

Timestamp:

Aug 18, 2016 5:00:32 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:

8cb1a07

Parents:

1ddf8f0

Message:

Write numerical values correctly

File:

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

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

@@ -409 +409 @@
             return np.array([np.string_(string)])
 
+        def _h5_float(x):
+            if not (isinstance(x, list)):
+                x = [x]
+            return np.array(x, dtype=np.float32)
+
         # Get run name and number from first Data object
         data_info = dataset[0]
@@ -469 +474 @@
                     collimation_entry.attrs['canSAS_class'] = 'SAScollimation'
                     if coll_info.length is not None:
-                        collimation_entry['SDD'] = coll_info.length
+                        collimation_entry['SDD'] = _h5_float(coll_info.length)
                         collimation_entry['SDD'].attrs['units'] = coll_info.length_unit
                     if coll_info.name is not None:
@@ -483 +488 @@
                     detector_entry.attrs['canSAS_class'] = 'SASdetector'
                     if det_info.distance is not None:
-                        detector_entry['SDD'] = det_info.distance
+                        detector_entry['SDD'] = _h5_float(det_info.distance)
                         detector_entry['SDD'].attrs['units'] = det_info.distance_unit
                     if det_info.name is not None:
@@ -489 +494 @@
                     else:
                         detector_entry['name'] = _h5_string('')
+                    i += 1
             else:
                 detector_entry = instrument_entry.create_group('sasdetector01')