Changeset b39c817 in sasview for DataLoader/readers

Timestamp:

Aug 4, 2008 10:39:43 AM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

ccb560a

Parents:

cfe97ea

Message:

Added unit converter for CanSAS format reader

File:

• DataLoader/readers/cansas_reader.py (modified) (4 diffs)

DataLoader/readers/cansas_reader.py

@@ -22 +22 @@
 from DataLoader.data_info import Data1D, Collimation, Detector, Process
 from xml import xpath
+
+has_converter = True
+try:
+    from data_util.nxsunit import Converter
+except:
+    has_converter = False
 
 def get_node_text(node):
@@ -87 +93 @@
     if content is not None:
         try:
-            value = float(content)        
+            value = float(content)   
         except:
             # Could not pass, skip and return None
@@ -113 +119 @@
     value, attr = get_float(location, node)
     if value is not None:
-        exec "storage.%s = value" % variable
-        
         # If the entry has units, check to see that they are
         # compatible with what we currently have in the data object
@@ -121 +125 @@
             exec "local_unit = storage.%s_unit.lower()" % toks[0]
             if attr['unit'].lower()!=local_unit:
-                raise ValueError, "CanSAS reader: unrecognized %s unit [%s]; expecting [%s]" \
-                    % (variable, attr['unit'], local_unit)
+                if has_converter==True:
+                    try:
+                        conv = Converter(attr['unit'])
+                        exec "storage.%s = %g" % (variable, conv(value, units=local_unit))
+                    except:
+                        raise ValueError, "CanSAS reader: could not convert %s unit [%s]; expecting [%s]\n  %s" \
+                        % (variable, attr['unit'], local_unit, sys.exc_value)
+                else:
+                    raise ValueError, "CanSAS reader: unrecognized %s unit [%s]; expecting [%s]" \
+                        % (variable, attr['unit'], local_unit)
+            else:
+                exec "storage.%s = value" % variable
+        else:
+            exec "storage.%s = value" % variable
+            
 
 def _store_content(location, node, variable, storage):