Changeset e390933 in sasview

Timestamp:

Sep 2, 2008 2:32:02 PM (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:

daa56d0

Parents:

1b162dfa

Message:

Added unit conversion tests for data loader.

Location:

DataLoader

Files:

• readers/cansas_reader.py (modified) (4 diffs)
• test/cansas1d_units.xml (added)
• test/utest_abs_reader.py (modified) (2 diffs)

DataLoader/readers/cansas_reader.py

@@ -17 +17 @@
 #TODO: Notes need to be implemented. They can be any XML structure in version 1.0
 #      Process notes have the same problem.
+#TODO: Unit conversion is not complete (temperature units are missing)
 
 
@@ -145 +146 @@
         if attr.has_key('unit'):
             toks = variable.split('.')
-            exec "local_unit = storage.%s_unit.lower()" % toks[0]
-            if attr['unit'].lower()!=local_unit:
+            exec "local_unit = storage.%s_unit" % toks[0]
+            if attr['unit'].lower()!=local_unit.lower():
                 if has_converter==True:
                     try:
@@ -462 +463 @@
         for item in nodes:
             _x, attr = get_float('Q', item)
-            _dx, attr = get_float('Qdev', item)
+            _dx, attr_d = get_float('Qdev', item)
             if _dx == None:
                 _dx = 0.0
+                
             if attr.has_key('unit') and attr['unit'].lower() != data_info.x_unit.lower():
-                raise ValueError, "CanSAS reader: unrecognized %s unit [%s]; expecting [%s]" \
-                    % (variable, attr['unit'], local_unit)
-                
+                if has_converter==True:
+                    try:
+                        data_conv_q = Converter(attr['unit'])
+                        _x = data_conv_q(_x, units=data_info.x_unit)
+                    except:
+                        raise ValueError, "CanSAS reader: could not convert Q unit [%s]; expecting [%s]\n  %s" \
+                        % (attr['unit'], data_info.x_unit, sys.exc_value)
+                else:
+                    raise ValueError, "CanSAS reader: unrecognized Q unit [%s]; expecting [%s]" \
+                        % (attr['unit'], data_info.x_unit)
+            if attr_d.has_key('unit') and attr_d['unit'].lower() != data_info.x_unit.lower():
+                if has_converter==True:
+                    try:
+                        data_conv_q = Converter(attr_d['unit'])
+                        _dx = data_conv_q(_dx, units=data_info.x_unit)
+                    except:
+                        raise ValueError, "CanSAS reader: could not convert dQ unit [%s]; expecting [%s]\n  %s" \
+                        % (attr['unit'], data_info.x_unit, sys.exc_value)
+                else:
+                    raise ValueError, "CanSAS reader: unrecognized dQ unit [%s]; expecting [%s]" \
+                        % (attr['unit'], data_info.x_unit)
+                    
             _y, attr = get_float('I', item)
-            _dy, attr = get_float('Idev', item)
+            _dy, attr_d = get_float('Idev', item)
             if _dy == None:
                 _dy = 0.0
             if attr.has_key('unit') and attr['unit'].lower() != data_info.y_unit.lower():
-                raise ValueError, "CanSAS reader: unrecognized %s unit [%s]; expecting [%s]" \
-                    % (variable, attr['unit'], local_unit)
+                if has_converter==True:
+                    try:
+                        data_conv_i = Converter(attr['unit'])
+                        _y = data_conv_i(_y, units=data_info.y_unit)
+                    except:
+                        raise ValueError, "CanSAS reader: could not convert I(q) unit [%s]; expecting [%s]\n  %s" \
+                        % (attr['unit'], data_info.y_unit, sys.exc_value)
+                else:
+                    raise ValueError, "CanSAS reader: unrecognized I(q) unit [%s]; expecting [%s]" \
+                        % (attr['unit'], data_info.y_unit)
+            if attr_d.has_key('unit') and attr_d['unit'].lower() != data_info.y_unit.lower():
+                if has_converter==True:
+                    try:
+                        data_conv_i = Converter(attr_d['unit'])
+                        _dy = data_conv_i(_dy, units=data_info.y_unit)
+                    except:
+                        raise ValueError, "CanSAS reader: could not convert dI(q) unit [%s]; expecting [%s]\n  %s" \
+                        % (attr_d['unit'], data_info.y_unit, sys.exc_value)
+                else:
+                    raise ValueError, "CanSAS reader: unrecognized dI(q) unit [%s]; expecting [%s]" \
+                        % (attr_d['unit'], data_info.y_unit)
                 
             if _x is not None and _y is not None:
@@ -499 +539 @@
             data_conv_i = Converter('1/cm')
             # Test it
-            data_conv_i(1.0, output.I_unit)            
-    
-        
+            data_conv_i(1.0, output.I_unit)                    
+                
         if data_conv_q is not None:
             data_info.xaxis("\\rm{Q}", data_info.x_unit)

DataLoader/test/utest_abs_reader.py

@@ -158 +158 @@
         self.assertEqual(self.data.dy[0], 3)
         self.assertEqual(self.data.x[1], 0.03)
-        self.assertEqual(self.data.y[1], 1001)
+        self.assertAlmostEquals(self.data.y[1], 1001.0)
         self.assertEqual(self.data.dx[1], 0.02)
         self.assertEqual(self.data.dy[1], 4)
@@ -294 +294 @@
         self._checkdata()
         
-        
+    def test_units(self):
+        """
+            Check units.
+            Note that not all units are available.
+        """
+        filename = "cansas1d_units.xml"
+        self.data = Loader().load(filename)
+        self.assertEqual(self.data.filename, filename)
+        self._checkdata()