Changeset 8db20a9 in sasview for src/sas/sascalc/data_util

Timestamp:

Jan 21, 2019 8:15:40 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

d541324e

Parents:

3ca645bb

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (01/21/19 08:12:08)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (01/21/19 08:15:40)

Message:

Updated cansas read (cherrypicked and fixed from master).
Fixes: hdf5 returns byte strings so these need to be recasted properly.
​https://github.com/h5py/h5py/issues/379

Location:

src/sas/sascalc/data_util

Files:

• nxsunit.py (modified) (2 diffs)
• registry.py (modified) (1 diff)

src/sas/sascalc/data_util/nxsunit.py

@@ -136 +136 @@
     sld = { '10^-6 Angstrom^-2': 1e-6, 'Angstrom^-2': 1 }
     Q = { 'invA': 1, 'invAng': 1, 'invAngstroms': 1, '1/A': 1,
+          '1/Angstrom': 1, '1/angstrom': 1, 'A^{-1}': 1, 'cm^{-1}': 1e-8,
           '10^-3 Angstrom^-1': 1e-3, '1/cm': 1e-8, '1/m': 1e-10,
-          'nm^-1': 0.1, '1/nm': 0.1, 'n_m^-1': 0.1 }
+          'nm^{-1}': 1, 'nm^-1': 0.1, '1/nm': 0.1, 'n_m^-1': 0.1 }
 
     _caret_optional(sld)
@@ -157 +158 @@
     # units for that particular dimension.
     # Note: don't have support for dimensionless units.
-    unknown = {None:1, '???':1, '': 1, 'a.u.': 1}
+    unknown = {None:1, '???':1, '': 1, 'a.u.': 1, 'Counts': 1, 'counts': 1}
 
     def __init__(self, name):

src/sas/sascalc/data_util/registry.py

@@ -111 +111 @@
             for L in loaders:
                 if L not in result: result.append(L)
-            loaders = L
+            loaders = result
+            #loaders = L
         # Raise an error if there are no matching extensions
         if len(loaders) == 0: