Changeset d00f8ff in sasview for DataLoader

Timestamp:

Oct 1, 2008 10:54:19 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:

cfbe9b5

Parents:

57f3320

Message:

First version of slit smearing and resolution smearing

Location:

DataLoader

Files:

• data_info.py (modified) (2 diffs)
• qsmearing.py (added)
• readers/cansas_reader.py (modified) (5 diffs)
• test/cansas1d_slit.xml (added)
• test/utest_abs_reader.py (modified) (1 diff)
• test/utest_smearing.py (added)

DataLoader/data_info.py

@@ -36 +36 @@
         Data1D is a place holder for 1D plottables.
     """
+    # The presence of these should be mutually exclusive with the presence of Qdev (dx)
     x = None
     y = None
     dx = None
     dy = None
+    ## Slit smearing length
+    dxl = None
+    ## Slit smearing width
+    dxw = None
     
     # Units
@@ -47 +52 @@
     _yunit = ''
     
-    def __init__(self,x,y,dx=None,dy=None):
+    def __init__(self,x,y,dx=None,dy=None,dxl=None,dxw=None):
         self.x = x
         self.y = y
         self.dx = dx
         self.dy = dy
+        self.dxl = dxl
+        self.dxw = dxw
 
     def xaxis(self, label, unit):

DataLoader/readers/cansas_reader.py

@@ -460 +460 @@
         dx = numpy.zeros(0)
         dy = numpy.zeros(0)
+        dxw = numpy.zeros(0)
+        dxl = numpy.zeros(0)
         
         for item in nodes:
             _x, attr = get_float('Q', item)
             _dx, attr_d = get_float('Qdev', item)
+            _dxl, attr_l = get_float('dQl', item)
+            _dxw, attr_w = get_float('dQw', item)
             if _dx == None:
                 _dx = 0.0
+            if _dxl == None:
+                _dxl = 0.0
+            if _dxw == None:
+                _dxw = 0.0
                 
             if attr.has_key('unit') and attr['unit'].lower() != data_info.x_unit.lower():
@@ -478 +486 @@
                     raise ValueError, "CanSAS reader: unrecognized Q unit [%s]; expecting [%s]" \
                         % (attr['unit'], data_info.x_unit)
+            # Error in Q
             if attr_d.has_key('unit') and attr_d['unit'].lower() != data_info.x_unit.lower():
                 if has_converter==True:
@@ -488 +497 @@
                 else:
                     raise ValueError, "CanSAS reader: unrecognized dQ unit [%s]; expecting [%s]" \
+                        % (attr['unit'], data_info.x_unit)
+            # Slit length
+            if attr_l.has_key('unit') and attr_l['unit'].lower() != data_info.x_unit.lower():
+                if has_converter==True:
+                    try:
+                        data_conv_q = Converter(attr_l['unit'])
+                        _dxl = data_conv_q(_dxl, units=data_info.x_unit)
+                    except:
+                        raise ValueError, "CanSAS reader: could not convert dQl unit [%s]; expecting [%s]\n  %s" \
+                        % (attr['unit'], data_info.x_unit, sys.exc_value)
+                else:
+                    raise ValueError, "CanSAS reader: unrecognized dQl unit [%s]; expecting [%s]" \
+                        % (attr['unit'], data_info.x_unit)
+            # Slit width
+            if attr_w.has_key('unit') and attr_w['unit'].lower() != data_info.x_unit.lower():
+                if has_converter==True:
+                    try:
+                        data_conv_q = Converter(attr_w['unit'])
+                        _dxw = data_conv_q(_dxw, units=data_info.x_unit)
+                    except:
+                        raise ValueError, "CanSAS reader: could not convert dQw unit [%s]; expecting [%s]\n  %s" \
+                        % (attr['unit'], data_info.x_unit, sys.exc_value)
+                else:
+                    raise ValueError, "CanSAS reader: unrecognized dQw unit [%s]; expecting [%s]" \
                         % (attr['unit'], data_info.x_unit)
                     
@@ -522 +555 @@
                 dx = numpy.append(dx, _dx)
                 dy = numpy.append(dy, _dy)
+                dxl = numpy.append(dxl, _dxl)
+                dxw = numpy.append(dxw, _dxw)
+                
             
         data_info.x = x
@@ -527 +563 @@
         data_info.dx = dx
         data_info.dy = dy
+        data_info.dxl = dxl
+        data_info.dxw = dxw
         
         data_conv_q = None

DataLoader/test/utest_abs_reader.py

@@ -326 +326 @@
         
         
-        
+    def test_slits(self):
+        """
+            Check slit data
+        """
+        filename = "cansas1d_slit.xml"
+        self.data = Loader().load(filename)
+        self.assertEqual(self.data.filename, filename)
+        self.assertEqual(self.data.run[0], "1234")
+        
+        # Data
+        self.assertEqual(len(self.data.x), 2)
+        self.assertEqual(self.data.x_unit, '1/A')
+        self.assertEqual(self.data.y_unit, '1/cm')
+        self.assertEqual(self.data.x[0], 0.02)
+        self.assertEqual(self.data.y[0], 1000)
+        self.assertEqual(self.data.dxl[0], 0.005)
+        self.assertEqual(self.data.dxw[0], 0.001)
+        self.assertEqual(self.data.dy[0], 3)
+        self.assertEqual(self.data.x[1], 0.03)
+        self.assertAlmostEquals(self.data.y[1], 1001.0)
+        self.assertEqual(self.data.dx[1], 0.0)
+        self.assertEqual(self.data.dxl[1], 0.005)
+        self.assertEqual(self.data.dxw[1], 0.001)
+        self.assertEqual(self.data.dy[1], 4)
+        self.assertEqual(self.data.run_name['1234'], 'run name')
+        self.assertEqual(self.data.title, "Test title")
+