nxsunit.py [b011ecb:e090ba90] in sasview

File:

src/sas/sascalc/data_util/nxsunit.py

-                      rb011ecb
+                      re090ba90
     Strip '^' from unit names.
+    * WARNING * this will incorrect transform 10^3 to 103.
+    """
+    s.update((k.replace('^',''),v)
+             for k, v in list(s.items())
+             if '^' in k)
+    * WARNING * this will incorrectly transform 10^3 to 103.
+    """
+    stripped = [(k.replace('^',''),v) for k, v in s.items() if '^' in k]
+    s.update(stripped)
 def _build_all_units():
 …
     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}': 1, 'nm^-1': 0.1, '1/nm': 0.1, 'n_m^-1': 0.1 }
+          'nm^-1': 0.1, '1/nm': 0.1, 'n_m^-1': 0.1 }
     _caret_optional(sld)
 …
     # units for that particular dimension.
     # Note: don't have support for dimensionless units.
     unknown = {None:1, '???':1, '': 1, 'a.u.': 1, 'Counts': 1, 'counts': 1}
+    unknown = {None:1, '???':1, '': 1, 'a.u.': 1}
     def __init__(self, name):

Note: See TracChangeset for help on using the changeset viewer.